Permalink
Switch branches/tags
android-wear-p-preview-2 android-wear-o-preview-4 android-wear-o-preview-3 android-wear-n-preview-2 android-wear-n-preview-1 android-wear-8.0.0_r1 android-wear-7.1.1_r1 android-wear-5.1.1_r1 android-wear-5.1.0_r1 android-wear-5.0.0_r1 android-vts-8.1_r5 android-vts-8.1_r4 android-vts-8.1_r3 android-vts-8.0_r8 android-vts-8.0_r7 android-vts-8.0_r6 android-vts-8.0_r2 android-vts-8.0_r1 android-sdk-support_r11 android-sdk-adt_r20 android-sdk-adt_r16.0.1 android-sdk-4.4.2_r1.0.1 android-sdk-4.4.2_r1 android-sdk-4.0.3_r1 android-sdk-4.0.3-tools_r1 android-p-preview-5 android-p-preview-4 android-p-preview-3 android-p-preview-2 android-p-preview-1 android-o-preview-4 android-o-preview-3 android-o-preview-2 android-o-preview-1 android-o-mr1-preview-2 android-o-mr1-preview-1 android-o-mr1-iot-release-1.0.4 android-o-mr1-iot-release-1.0.3 android-o-mr1-iot-release-1.0.2 android-o-mr1-iot-release-1.0.1 android-o-mr1-iot-release-1.0.0 android-o-mr1-iot-preview-8 android-o-mr1-iot-preview-7 android-o-mr1-iot-preview-6 android-o-iot-preview-5 android-n-preview-5 android-n-preview-4 android-n-preview-3 android-n-preview-2 android-n-preview-1 android-n-mr2-preview-2 android-n-mr2-preview-1 android-n-mr1-preview-2 android-n-mr1-preview-1 android-n-iot-release-smart-display android-n-iot-release-smart-display-r2 android-n-iot-release-polk-at1 android-n-iot-release-lg-thinq-wk7 android-n-iot-preview-4 android-n-iot-preview-2 android-m-preview android-m-preview-2 android-m-preview-1 android-l-preview_r2 android-cts-verifier-4.0.3_r1 android-cts-verifier-4.0_r1 android-cts-9.0_r2 android-cts-9.0_r1 android-cts-8.1_r9 android-cts-8.1_r8 android-cts-8.1_r7 android-cts-8.1_r6 android-cts-8.1_r5 android-cts-8.1_r4 android-cts-8.1_r3 android-cts-8.1_r2 android-cts-8.1_r1 android-cts-8.0_r13 android-cts-8.0_r12 android-cts-8.0_r11 android-cts-8.0_r10 android-cts-8.0_r9 android-cts-8.0_r8 android-cts-8.0_r7 android-cts-8.0_r6 android-cts-8.0_r5 android-cts-8.0_r4 android-cts-8.0_r3 android-cts-8.0_r2 android-cts-8.0_r1 android-cts-7.1_r21 android-cts-7.1_r20 android-cts-7.1_r19 android-cts-7.1_r18 android-cts-7.1_r17 android-cts-7.1_r16 android-cts-7.1_r15 android-cts-7.1_r14 android-cts-7.1_r13 android-cts-7.1_r12
Nothing to show
Commits on Feb 23, 2016
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Feb 23, 2016
    Auto-generated-cl: translation import
    
    Bug: 27293916
    Change-Id: I063070ef709ee67df98c3bdcb53232adf9ea5438
Commits on Dec 11, 2015
  1. Merge "Disable Android Beam"

    tornewuff authored and android-build-merger committed Dec 11, 2015
    am: f5e0370
    
    * commit 'f5e0370a0d6a52c0bc029ced4fcc0453bed2f7eb':
      Disable Android Beam
  2. Merge "Disable Android Beam"

    tornewuff authored and Gerrit Code Review committed Dec 11, 2015
Commits on Dec 10, 2015
  1. Disable Android Beam

    amoseui committed Dec 9, 2015
    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>
Commits on Nov 11, 2015
  1. Merge "Reload data after the permission is granted" am: 935203f

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

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

    Paul Miller Gerrit Code Review
    Paul Miller authored and Gerrit Code Review committed Nov 11, 2015
Commits on Nov 5, 2015
  1. Import translations. DO NOT MERGE

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

    Baligh Uddin
    Baligh Uddin committed Nov 5, 2015
    Auto-generated-cl: translation import
    
    Bug: 25433205
    Change-Id: I810d7d29200cfeb845c01be7cbfc6e06c12aa7ea
Commits on Nov 3, 2015
  1. Reload data after the permission is granted

    amoseui committed Oct 26, 2015
    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>
Commits on Oct 28, 2015
  1. Merge "Manual cherry-pick of "Update permission usage for M""

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

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

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

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

    Baligh Uddin
    Baligh Uddin committed Sep 29, 2015
    Change-Id: I47e1f303a974c36d192c3631b3d7c6279d96bf1f
    Auto-generated-cl: translation import
Commits on May 22, 2015
  1. am 5b937c3: Merge "Implement shouldOverrideUrlLoading to open hyperli…

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

    tornewuff authored and Gerrit Code Review committed May 22, 2015
    …ewer."
Commits on May 20, 2015
  1. Implement shouldOverrideUrlLoading to open hyperlink on HTMLViewer.

    amoseui committed Apr 30, 2015
    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>
Commits on Nov 18, 2014
  1. am 50278da: Restore zoom controls in HTMLViewer

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

    Mikhail Naganov
    Mikhail Naganov committed Nov 17, 2014
    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
Commits on Nov 15, 2014
  1. am c9cd4b6: Modernize HTMLViewer, offer to decompress.

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

    jsharkey committed Nov 14, 2014
    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
Commits on Jul 28, 2014
  1. am 2e368f6: Do not crash on opening a directory.

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

    Ben Murdoch
    Ben Murdoch committed Jul 24, 2014
    Bug: 16542465
    Change-Id: Ic062defe3ba4d69020968cb2c85bf9dc52268ec8
Commits on Jul 21, 2014
  1. am 9988837: (-s ours) Remove deprecated locales - DO NOT MERGE

    Baligh Uddin Android Git Automerger
    Baligh Uddin authored and Android Git Automerger committed Jul 21, 2014
    * commit '99888374e72a9b7099bdb1320d6cc69f454520e2':
      Remove deprecated locales - DO NOT MERGE
Commits on Jul 19, 2014
  1. Remove deprecated locales - DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Jul 19, 2014
    Change-Id: Ide5dceaba5a02145c24802e3c06855ed6194093d
Commits on Jul 17, 2014
  1. Remove deprecated locales

    Baligh Uddin
    Baligh Uddin committed Jul 17, 2014
    Change-Id: I0cef4e193122a03a22fe28e4ce3c840269082e60
Commits on Jul 5, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Jul 5, 2014
    Change-Id: I44584d500f2cc4fe66b45b254e1703f1e74783e0
    Auto-generated-cl: translation import
Commits on Jun 30, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Jun 30, 2014
    Change-Id: Ibd18a26f22f405d7753acbe261349165488e8c94
    Auto-generated-cl: translation import
Commits on Apr 23, 2014
  1. am 86538de: (-s ours) am 325f3e0: (-s ours) Import translations. DO N…

    Baligh Uddin Android Git Automerger
    Baligh Uddin authored and Android Git Automerger committed Apr 23, 2014
    …OT MERGE
    
    * commit '86538debcdf7c59cf6e299c5c4c6ac1f883c2ed1':
      Import translations. DO NOT MERGE
  2. am 325f3e0: (-s ours) Import translations. DO NOT MERGE

    Baligh Uddin Android Git Automerger
    Baligh Uddin authored and Android Git Automerger committed Apr 23, 2014
    * commit '325f3e0fc35ae4bee228ae465cd9ba4dd35cf7d9':
      Import translations. DO NOT MERGE
  3. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Apr 23, 2014
    Change-Id: Id37bf1cfdac88fb9f5aec52c6ddc5b869201dafc
    Auto-generated-cl: translation import
Commits on Apr 11, 2014
  1. Revert "Mark HTMLViewer as required for all profikes"

    Alexandra Gherghina
    Alexandra Gherghina committed Apr 11, 2014
    This reverts commit a168cc8.
    
    We've switched to a whitelist approach.
    
    Change-Id: Ibe603e9c913a28bbb8cf982e1e1fee4d3eb82f8d
Commits on Apr 1, 2014
  1. Mark HTMLViewer as required for all profikes

    Alexandra Gherghina
    Alexandra Gherghina committed Apr 1, 2014
    Change-Id: I12697be3b47c68ad94597c626a466f80b5c4427d
Commits on Mar 26, 2014
  1. Update HTMLViewer to use utf-8 text encoding.

    Ben Murdoch
    Ben Murdoch committed Mar 26, 2014
    By default, WebView will use Latin-1 encoding.
    
    Patch courtesy of Takeshi Aimi.
    
    Bug: 13214875
    Change-Id: I16d3bf91904b617fd25c98d68771330c01055f18