summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not crash on opening a directory.staging/cm-12.0-cafBen Murdoch2014-07-241-2/+5
| | | | | Bug: 16542465 Change-Id: Ic062defe3ba4d69020968cb2c85bf9dc52268ec8
* Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-192-40/+0
| | | | Change-Id: Ide5dceaba5a02145c24802e3c06855ed6194093d
* Import translations. DO NOT MERGEBaligh Uddin2014-07-051-0/+20
| | | | | Change-Id: I44584d500f2cc4fe66b45b254e1703f1e74783e0 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-06-291-0/+20
| | | | | Change-Id: Ibd18a26f22f405d7753acbe261349165488e8c94 Auto-generated-cl: translation import
* am 86538deb: (-s ours) am 325f3e0f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
|\ | | | | | | | | * commit '86538debcdf7c59cf6e299c5c4c6ac1f883c2ed1': Import translations. DO NOT MERGE
| * am 325f3e0f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
| |\ | | | | | | | | | | | | * commit '325f3e0fc35ae4bee228ae465cd9ba4dd35cf7d9': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2014-04-224-0/+80
| |/ | | | | | | | | Change-Id: Id37bf1cfdac88fb9f5aec52c6ddc5b869201dafc Auto-generated-cl: translation import
* | Revert "Mark HTMLViewer as required for all profikes"Alexandra Gherghina2014-04-111-2/+1
| | | | | | | | | | | | | | | | This reverts commit a168cc8e3b25b3a4d2c48f1a623ee3337d78e8f0. We've switched to a whitelist approach. Change-Id: Ibe603e9c913a28bbb8cf982e1e1fee4d3eb82f8d
* | Mark HTMLViewer as required for all profikesAlexandra Gherghina2014-04-011-1/+2
| | | | | | | | Change-Id: I12697be3b47c68ad94597c626a466f80b5c4427d
* | Update HTMLViewer to use utf-8 text encoding.Ben Murdoch2014-03-261-0/+2
| | | | | | | | | | | | | | | | | | By default, WebView will use Latin-1 encoding. Patch courtesy of Takeshi Aimi. Bug: 13214875 Change-Id: I16d3bf91904b617fd25c98d68771330c01055f18
* | Merge "Revert "HTMLViewer: allow encoding to be specified in incoming Intent.""Ben Murdoch2014-03-171-8/+0
|\ \
| * | Revert "HTMLViewer: allow encoding to be specified in incoming Intent."Ben Murdoch2014-03-171-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | We are going to unconditionally go for UTF-8 going forward. This reverts commit 3b1632a210328fc8e924bb40316d793502206a37. Change-Id: Ib8792c613c0d30b2097e125ea7c3bdaf6d737fd5
* | | am 74988900: (-s ours) am be6aab13: Do not add mimetype to url as a query ↵Selim Gurun2014-03-030-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | parameter * commit '7498890092c388dc59ca932e09ec79dd568b1a19': Do not add mimetype to url as a query parameter
| * am be6aab13: Do not add mimetype to url as a query parameterSelim Gurun2014-03-031-4/+0
| |\ | | | | | | | | | | | | * commit 'be6aab13c62ab5d5c91262c8188521cbc4262349': Do not add mimetype to url as a query parameter
| | * Do not add mimetype to url as a query parameterSelim Gurun2014-02-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11654127 Adding mimetype to url as a query parameter is a bad practice as it requires us to inject app specific behavior to webview. There also seems no reason to add this, so removing. Change-Id: Ib2e5198981f2d37128ab545a33b83e8109bf3eef (cherry picked from commit dd44be0b2e29ee043ac8c25dba34f11b9c018c46)
* | | HTMLViewer: allow encoding to be specified in incoming Intent.Ben Murdoch2014-02-281-0/+8
| | | | | | | | | | | | | | | | | | Bug:13214875 Change-Id: I7eb9857e9f6d3f640c6264da98681d065e22527f
* | | Clean up whitespace.Ben Murdoch2014-02-283-36/+36
| | | | | | | | | | | | Change-Id: Ib1b38186027244c1218fab0d1c81400b9ad570a3
* | | Remove deprecated localesBaligh Uddin2013-12-093-60/+0
| | | | | | | | | | | | | | | | | | Bug:11340849 Change-Id: I5afdbaa18cece0682fa2ae1fb37f71d41ea87a73
* | | Do not add mimetype to url as a query parameterSelim Gurun2013-12-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11654127 Adding mimetype to url as a query parameter is a bad practice as it requires us to inject app specific behavior to webview. There also seems no reason to add this, so removing. Change-Id: Ib2e5198981f2d37128ab545a33b83e8109bf3eef
* | | am ff9625bd: am 9715e7c9: Enable zoom controls in HTMLViewerMikhail Naganov2013-09-191-1/+2
|\| | | | | | | | | | | | | | * commit 'ff9625bd7217114c61d7bd0c08ce2dbbe8df4ae1': Enable zoom controls in HTMLViewer
| * | am 9715e7c9: Enable zoom controls in HTMLViewerMikhail Naganov2013-09-191-1/+2
| |\| | | | | | | | | | | | | * commit '9715e7c99a3a86162718d7932aaa174090abc381': Enable zoom controls in HTMLViewer
| | * Enable zoom controls in HTMLViewerMikhail Naganov2013-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to changes in Chromium WebView, text files may be displayed using a smaller font, not comfortable for reading. Enabling zoom controls serves as a workaround. This also puts HTMLViewer on par with DocViewer (for office files), which also allows zooming of contents. BUG: 10674904 Change-Id: I806fbed103e6f714824f69d78e681ee96f142d42
* | | am f9e3989b: (-s ours) am 57f281ae: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-140-0/+0
|\| | | | | | | | | | | | | | * commit 'f9e3989b9febc48a47c04f08b8d77626c4a99341': Import translations. DO NOT MERGE
| * | am 57f281ae: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-140-0/+0
| |\| | | | | | | | | | | | | * commit '57f281ae30fa8043549a4cc80d752cb64ed0e9d2': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2013-09-144-0/+80
| |/ | | | | | | | | Change-Id: I99ffc525997bcd0c3e39c5db68daae459e9a991a Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-08-262-0/+40
| | | | | | | | | | Change-Id: I56680868289b1ed8a94fb031ea1fe0e65cc79a13 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-08-192-0/+40
|/ | | | | Change-Id: I159120a72c4bb6a1f573ae248e9db082fa3af09f Auto-generated-cl: translation import
* Fix the theme.Selim Gurun2013-07-171-1/+1
| | | | | Bug: 6508085 Change-Id: I006a3b1c55b2e64a8852ebe3511bfe9eb8f8f35c
* Don't call WebView.stopLoading() from onStop()Ben Murdoch2013-07-031-1/+0
| | | | | | | | | | If the app is opened while the screen is off, the call to WebView.stopLoading can cause the load triggered by onCreate to stop - never being resumed or restarted, resulting in no content. BUG=9493580 Change-Id: I7f19cbbe4d9dc735ed976798ccf783bbf42c8c8f
* am 4222180d: Merge "HTMLViewer could not open UTF-8 encoded file path."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1John Reck2012-08-311-2/+1
|\ | | | | | | | | * commit '4222180dd0d4f3e1f094bf72a78d6d88a876bac8': HTMLViewer could not open UTF-8 encoded file path.
| * Merge "HTMLViewer could not open UTF-8 encoded file path."John Reck2012-08-311-2/+1
| |\
| | * HTMLViewer could not open UTF-8 encoded file path.Alex Hua2012-08-301-2/+1
| |/ | | | | | | | | | | | | | | HTMLViewer got encoded file path in onCreate but did not decode the path when opening it. This caused a problem when the file path contained non-ASCII codes like Chinese, Japanese or Korean. Change-Id: I50dd611fc6da9b854c19ff5752785ae710f3b33d
* | am 78afabcb: Add read permission for external storageSelim Gurun2012-06-071-1/+1
|\| | | | | | | | | * commit '78afabcb89cc9b94bd0bc0b9eebe317e7c2ba959': Add read permission for external storage
| * Add read permission for external storagejellybean-stablejellybeanSelim Gurun2012-06-071-1/+1
| | | | | | | | | | Bug: 6591573 Change-Id: I82f554974b0d56f2ff7fa98dea5d9854e4235f95
* | Import translations. DO NOT MERGEEric Fischer2012-05-251-1/+1
|/ | | | Change-Id: I761a73a2483550a6f68238c686822f12ff8e3725
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 4230220e: Import revised translations.Eric Fischer2011-11-012-0/+40
| |\ | | | | | | | | | | | | * commit '4230220ef8be426d69bb1a3f0f7a012793ce0d27': Import revised translations.
| * \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \
| | * \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \
| | | * | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | |/|/ /
| | * | am 71922b96: Merge "Import revised translations."Eric Fischer2011-10-181-0/+20
| | |\ \ | | |/ / | |/| | | | | | | | | | * commit '71922b9605cbd791353b44114587b7a3b2c6d7c5': Import revised translations.
| | * | am 8237beb2: (-s ours) am 94d7e982: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '8237beb2f0bf6ccf97b9042d3d737274d6116272': Import revised translations. DO NOT MERGE
| | * \ \ am ce323a55: Import revised translations.Eric Fischer2011-09-201-0/+20
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce323a552359860d651915265e293a4bc75fb4b2': Import revised translations.
| | * \ \ \ am 2c99a766: (-s ours) am ca273e1f: (-s ours) Import revised translations. ↵Eric Fischer2011-09-160-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '2c99a7667d8652d8d7c0e34321e637a269fa9dfb': Import revised translations. DO NOT MERGE
* | | \ \ \ \ Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Import revised translations.Eric Fischer2011-11-022-0/+40
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I7299fa36dbbee371330351792ca5482c1bf64fda
* / / / / / Import revised translations.ics-releaseicscm-9.1.0Eric Fischer2011-11-012-0/+40
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Ic0b1c31915b57f6558299270c540a9a6d35c241d
* | | | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import revised translations.Eric Fischer2011-10-181-0/+20
| | |_|/ | |/| | | | | | | | | | Change-Id: I5cb6b707c898d29b8f7d5d7eeb852497b4304d48
* | | | am 94d7e982: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * commit '94d7e982124753e00d05a0bee4df20dcabafb839': Import revised translations. DO NOT MERGE