Permalink
Commits on Mar 19, 2016
  1. Import translations. DO NOT MERGE

    am: aeb4fff  -s ours
    
    * commit 'aeb4fff160e1b8d3ce545590ae674cbb5412dc5b':
      Import translations. DO NOT MERGE
    Geoff Mendal committed with android-build-merger Mar 19, 2016
  2. Import translations. DO NOT MERGE

    Change-Id: I83275b2498ebf748f2c57cb0280d17a5c7b268ab
    Auto-generated-cl: translation import
    Geoff Mendal committed Mar 19, 2016
Commits on Feb 23, 2016
  1. Import translations. DO NOT MERGE

    am: 798b0a4  -s ours
    
    * commit '798b0a44098230881f7f25bb1e7b23db2e846099':
      Import translations. DO NOT MERGE
    Baligh Uddin committed with android-build-merger Feb 23, 2016
  2. Import translations. DO NOT MERGE

    Auto-generated-cl: translation import
    
    Bug: 27293916
    Change-Id: I063070ef709ee67df98c3bdcb53232adf9ea5438
    Baligh Uddin committed Feb 23, 2016
Commits on Feb 19, 2016
  1. Fix crash in onRequestPermissionsResult due to empty grantResults

    In the case when the permission request dialog is displayed and the
    device is changing orientation, the callback will be called with empty
    grantResults array. The code needs to take this case into account.
    
    Bug: 27237709
    Change-Id: I450d365fcdfa308a69265d75391661fa64028734
    Mikhail Naganov committed Feb 19, 2016
Commits on Dec 16, 2015
  1. Import translations. DO NOT MERGE

    Change-Id: I1918ee9be7ded10060a68025d43e979727c8e057
    Auto-generated-cl: translation import
    Geoff Mendal committed Dec 16, 2015
Commits on Dec 11, 2015
  1. @tornewuff

    Merge "Disable Android Beam" am: f5e0370

    am: 7ca17e9
    
    * commit '7ca17e94b01059194985d3c3fe859f164fa555aa':
      Disable Android Beam
    tornewuff committed with android-build-merger Dec 11, 2015
  2. @tornewuff

    Merge "Disable Android Beam"

    am: f5e0370
    
    * commit 'f5e0370a0d6a52c0bc029ced4fcc0453bed2f7eb':
      Disable Android Beam
    tornewuff committed with android-build-merger Dec 11, 2015
  3. @tornewuff

    Merge "Disable Android Beam"

    tornewuff committed with Gerrit Code Review Dec 11, 2015
Commits on Dec 10, 2015
  1. @amoseui

    Disable Android Beam

    When trying to send files opened with HTMLViewer by Android Beam,
    in other device, it tries to find HTMLViewer in Google Play and
    shows 'item not found'. Since HTMLViewer does not support Android Beam,
    it would be better to disable Android Beam at all.
    
    Change-Id: I8cc684881e0114071e03b48703ac194d2978e3a6
    Signed-off-by: Euisang Lim <eui-sang.lim@samsung.com>
    amoseui committed Dec 9, 2015
Commits on Nov 11, 2015
  1. Merge "Reload data after the permission is granted" am: 935203f am: d…

    …9e7e17
    
    am: 5af4cf9
    
    * commit '5af4cf9e89c488c92dab9f8bafe81b85ce237c4a':
      Reload data after the permission is granted
    Paul Miller committed with android-build-merger Nov 11, 2015
  2. Merge "Reload data after the permission is granted" am: 935203f

    am: d9e7e17
    
    * commit 'd9e7e17b3a2b200b96f4ddc5cf2af11e7ecf17a2':
      Reload data after the permission is granted
    Paul Miller committed with android-build-merger Nov 11, 2015
  3. Merge "Reload data after the permission is granted"

    am: 935203f
    
    * commit '935203f1c663f3325ba03cffee8482340117faf7':
      Reload data after the permission is granted
    Paul Miller committed with android-build-merger Nov 11, 2015
  4. Merge "Reload data after the permission is granted"

    Paul Miller committed with Gerrit Code Review Nov 11, 2015
Commits on Nov 7, 2015
  1. Import translations. DO NOT MERGE am: d91a72e -s ours

    am: 0420b0e  -s ours
    
    * commit '0420b0e2a27a2f14bbfae6a617131f9343416da2':
      Import translations. DO NOT MERGE
    Baligh Uddin committed with android-build-merger Nov 7, 2015
Commits on Nov 5, 2015
  1. Import translations. DO NOT MERGE

    am: d91a72e  -s ours
    
    * commit 'd91a72e7ff39d8ee158565a5670081c63cf2e249':
      Import translations. DO NOT MERGE
    Baligh Uddin committed with android-build-merger Nov 5, 2015
  2. Import translations. DO NOT MERGE

    Auto-generated-cl: translation import
    
    Bug: 25433205
    Change-Id: I810d7d29200cfeb845c01be7cbfc6e06c12aa7ea
    Baligh Uddin committed Nov 5, 2015
Commits on Nov 3, 2015
  1. @amoseui

    Reload data after the permission is granted

    HTMLViewer tries to load data even if the permission is denied.
    It just shows up 'Webpage not available', so users can't notice
    that this is the permission problem. It would be better to check
    if the data has file scheme and show dialog to check permission.
    HTMLViewer gets closed and shows toast message if permission is denied.
    On the other hand, it reloads data if permission is granted by a user.
    
    Change-Id: I26ad05136194cb36d4a17d3a8ab1a3fd2b5dfeb5
    Signed-off-by: Euisang Lim <eui-sang.lim@samsung.com>
    amoseui committed Oct 26, 2015
Commits on Oct 28, 2015
  1. Merge "Manual cherry-pick of "Update permission usage for M"" am: 4e9…

    …bcb7
    
    am: 5dcaddb
    
    * commit '5dcaddb5166e5473925a374bd169aa025df0da10':
      Manual cherry-pick of "Update permission usage for M"
    Paul Miller committed with android-build-merger Oct 28, 2015
  2. Merge "Manual cherry-pick of "Update permission usage for M""

    am: 4e9bcb7
    
    * commit '4e9bcb71eb88de0e4d91b126e31925725f7c483a':
      Manual cherry-pick of "Update permission usage for M"
    Paul Miller committed with android-build-merger Oct 28, 2015
  3. Merge "Manual cherry-pick of "Update permission usage for M""

    Paul Miller committed with Gerrit Code Review Oct 28, 2015
  4. Manual cherry-pick of "Update permission usage for M"

    Manual cherry-pick of 72c9927
    from internal/master to aosp/master
    
    BUG:24172966
    Change-Id: I7c6d97555e72a8ae8297d64c747378c9ab09354e
    Paul Miller committed Oct 28, 2015
Commits on Sep 29, 2015
  1. am 2962df6: (-s ours) am eb41844: (-s ours) Import translations. DO N…

    …OT MERGE
    
    * commit '2962df6990830b72f7139475d7238ecdb4dda851':
      Import translations. DO NOT MERGE
    Baligh Uddin committed with Android Git Automerger Sep 29, 2015
  2. am eb41844: (-s ours) Import translations. DO NOT MERGE

    * commit 'eb41844b966152093b0077dc61dac010a11c1d08':
      Import translations. DO NOT MERGE
    Baligh Uddin committed with Android Git Automerger Sep 29, 2015
  3. Import translations. DO NOT MERGE

    Change-Id: I47e1f303a974c36d192c3631b3d7c6279d96bf1f
    Auto-generated-cl: translation import
    Baligh Uddin committed Sep 29, 2015
Commits on Sep 25, 2015
  1. Update permission usage for M

    BUG:24172966
    Change-Id: I6d7bde27e496b7113cabb124fe1991a4af420a98
    Paul Miller committed Sep 25, 2015
Commits on May 25, 2015
  1. Import translations. DO NOT MERGE

    Change-Id: Ia97f24574cc86fcb0e718af177c22e328ec9b1e1
    Auto-generated-cl: translation import
    Geoff Mendal committed May 25, 2015
Commits on May 22, 2015
  1. @tornewuff

    am 5b937c3: Merge "Implement shouldOverrideUrlLoading to open hyperli…

    …nk on HTMLViewer."
    
    * commit '5b937c30f95829bcbd3ff35e7c0d4f4bc2d5f302':
      Implement shouldOverrideUrlLoading to open hyperlink on HTMLViewer.
    tornewuff committed with Android Git Automerger May 22, 2015
  2. @tornewuff

    Merge "Implement shouldOverrideUrlLoading to open hyperlink on HTMLVi…

    …ewer."
    tornewuff committed with Gerrit Code Review May 22, 2015
Commits on May 20, 2015
  1. @amoseui @amoseui

    Implement shouldOverrideUrlLoading to open hyperlink on HTMLViewer.

    Since WebViewClient was set to WebView, hyperlink has not been working
    on HTMLViewer because WebViewClient has empty shouldOverrideUrlLoading.
    Therefore, copied shouldOverrideUrlLoading from WebViewContentsClientAdapter.java in Android WebView
    Opensource.
    
    bug: https://code.google.com/p/android/issues/detail?id=170578
    
    Change-Id: I8ad0584c72be2f96ff88901f6d031144d4a98b38
    Signed-off-by: Euisang Lim <eui-sang.lim@samsung.com>
    amoseui committed with amoseui Apr 30, 2015
Commits on Nov 18, 2014
  1. am 50278da: Restore zoom controls in HTMLViewer

    * commit '50278dabb69191ed8605164936081a1701256cdd':
      Restore zoom controls in HTMLViewer
    Mikhail Naganov committed with Android Git Automerger Nov 18, 2014
  2. Restore zoom controls in HTMLViewer

    WebSettings.setBuiltInZoomControls must be set to 'true' for zoom
    controls and pinch-zooming to work. And then we need to call
    WebSettings.setDisplayZoomControls(false) to leave only pinch-zoom.
    
    Bug: 18403885
    Change-Id: I549fc11673096046212f8c8efaf65824d1000ad7
    Mikhail Naganov committed Nov 17, 2014
Commits on Nov 15, 2014
  1. @jsharkey

    am c9cd4b6: Modernize HTMLViewer, offer to decompress.

    * commit 'c9cd4b66263697ddc227b012d96a90ead8d21d92':
      Modernize HTMLViewer, offer to decompress.
    jsharkey committed with Android Git Automerger Nov 15, 2014
Commits on Nov 14, 2014
  1. @jsharkey

    Modernize HTMLViewer, offer to decompress.

    Spruce up the UI to match Material spec.  We can also load file://
    content directly instead of forcing through a ContentProvider.
    
    Since we're using this to show license content, try decompressing
    files that end in ".gz", but fall back to loading normally if it's
    not compressed.  Let callers provide a window title.
    
    Bug: 18376908
    Change-Id: I59ce02fb17fbe157239d365417a1a1e88e2a18d4
    jsharkey committed Nov 14, 2014
Commits on Jul 28, 2014
  1. am 2e368f6: Do not crash on opening a directory.

    * commit '2e368f6d87eb82691f855e93f85599b75b489731':
      Do not crash on opening a directory.
    Ben Murdoch committed with Android Git Automerger Jul 28, 2014