summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-02Import translations. DO NOT MERGEGeoff Mendal
am: 6a3952faab -s ours * commit '6a3952faab395cb38216943bf1430d1441ee1a4d': Import translations. DO NOT MERGE
2016-02-02Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ie354a07837f74849ec87b9888ce95e6caf7f8c8c Auto-generated-cl: translation import
2015-12-16Import translations. DO NOT MERGE am: fb7517dcf9 -s oursGeoff Mendal
am: 56c9eefcf8 -s ours * commit '56c9eefcf86e1b88e16ef5035b82282a7c1505dc': Import translations. DO NOT MERGE
2015-12-16Import translations. DO NOT MERGEmarshmallow-dr1.5-devGeoff Mendal
am: fb7517dcf9 -s ours * commit 'fb7517dcf9ed50b4a08aefca4d400ae66b5d6cfb': Import translations. DO NOT MERGE
2015-12-15Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I9668e49956e6e37761a31cdb6b7fae707dd07e9e Auto-generated-cl: translation import
2015-10-26Import translations. DO NOT MERGEandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releaseGeoff Mendal
am: 7102c3675f -s ours * commit '7102c3675f5058706dbf1cc62b23c014b167b75e': Import translations. DO NOT MERGE
2015-10-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I321460befaa0bc076b4225814e6d68c900678a33 Auto-generated-cl: translation import
2015-10-21Import translations. DO NOT MERGEGeoff Mendal
am: bb3e2d9b51 -s ours * commit 'bb3e2d9b5128e9b21290a7b63df0c6c49291957f': Import translations. DO NOT MERGE
2015-10-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I277ca2ed07fb5786a38156ef165b632698664127 Auto-generated-cl: translation import
2015-10-20Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: ↵Qiwen Zhao
a082f08797 am: f5deeec57f am: b8de50cfea * commit 'b8de50cfea6364a1cddac50b987c9cda40f53dbb': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
2015-10-20Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797Qiwen Zhao
am: f5deeec57f * commit 'f5deeec57f4caaca1478dafa567c7d13df1cfa17': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
2015-10-20Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-devmarshmallow-mr1-devQiwen Zhao
am: a082f08797 * commit 'a082f08797d44164d1c735b4f0a9d4f94b1d1410': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
2015-10-19Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into mnc-devQiwen Zhao
2015-09-19am 9bc58b22: (-s ours) am af710f26: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '9bc58b22e64a50408d4af874d02af58c9a148d4a': Import translations. DO NOT MERGE
2015-09-19am af710f26: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'af710f265a2502289955875c1810f4f825370da6': Import translations. DO NOT MERGE
2015-09-18Import translations. DO NOT MERGEandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-dr-devBaligh Uddin
Change-Id: Ib7c3c0833967db07378d1ae04829d38cc4b24777 Auto-generated-cl: translation import
2015-07-15am 74f2fe5f: (-s ours) am b2fd1224: (-s ours) am 9ecaa9d5: (-s ours) Import ↵Geoff Mendal
translations. DO NOT MERGE * commit '74f2fe5f7b38ff06c5fb10c1512d473387d43e6c': Import translations. DO NOT MERGE
2015-07-15am b2fd1224: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'b2fd1224484a527c5f506ae86675d765de333fa3': Import translations. DO NOT MERGE
2015-07-15am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '9ecaa9d5af42effca6b4701d70d234029d447a2e': Import translations. DO NOT MERGE
2015-07-15Import translations. DO NOT MERGEmarshmallow-devGeoff Mendal
Change-Id: I25885ec3a308bd96d81f6003dbe12695484b7e50 Auto-generated-cl: translation import
2015-07-13am 26cfbd02: (-s ours) am 6eb32063: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '26cfbd025fc27791475c840813e886fe5312fc56': Import translations. DO NOT MERGE
2015-07-13am 6eb32063: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '6eb32063eb7d9aaae3ee3ccebe86a27a2f36aa19': Import translations. DO NOT MERGE
2015-07-11Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ie8eac3f74855135f99873b64790e09f89d991223 Auto-generated-cl: translation import
2015-06-13am 9ac94b56: Increment kAwDrawGLInfoVersionChris Craik
* commit '9ac94b56b31c90a50edb5f643f8afa4fd40e52d8': Increment kAwDrawGLInfoVersion
2015-06-12Increment kAwDrawGLInfoVersionChris Craik
bug:17322378 Change-Id: I18e2311277dc015a74683a3f0ccc2d84605ef68c
2015-05-30am f7b7ef98: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'f7b7ef98a673ea632c9b556418fbc638a54f31f2': Import translations. DO NOT MERGE
2015-05-30Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If3e356f74682531ad9b49097d4d4e5f1b8bc7ab7 Auto-generated-cl: translation import
2015-05-28Remove no-longer-used webview glue sources.Torne (Richard Coles)
The WebView glue code no longer lives in Android, it's in the Chromium repository with the rest of the WebView implementation. Remove the unused sources, the unused build configuration, and also the obsolete scripts for running the downstream buildbot and merging Chromium changes into Android. Change-Id: If45550f5951bc7773c7ed011c05f845d1b65251b
2015-05-20am 12399ba4: Fix WebView targetSDK checks.Ben Murdoch
* commit '12399ba4bb12154b7897cf88bee04aca0adeb770': Fix WebView targetSDK checks.
2015-04-26am 446ce2c2: (-s ours) Add support for SmartClip interface in the glue layer.Ben Murdoch
* commit '446ce2c24d3a1670de478701ea970ceba323e543': Add support for SmartClip interface in the glue layer.
2015-04-26am ddbcc035: (-s ours) Always add the path to the WebView assets.Ben Murdoch
* commit 'ddbcc0351201dc71b48252573b37da33deba1a83': Always add the path to the WebView assets.
2015-04-24Merge "Return error code when failing to load webview relro file."Gustav Sennton
2015-04-22Merge "Revert "Revert "GraphicsJNI update"""John Reck
2015-04-22Revert "Revert "GraphicsJNI update""John Reck
This reverts commit c2aae77521ed9db7157053968fe1070b8cac2d6a.
2015-04-22Merge "Import translations. DO NOT MERGE"Geoff Mendal
2015-04-22Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I5c0a6b5dc4a74623ef4e816879fef88c17d8df22 Auto-generated-cl: translation import
2015-04-22Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If45be07dbaf0bd921408b0f041d79f983705e395 Auto-generated-cl: translation import
2015-04-20[Android WebView] Delete WebViewShell.Tim Volodine
WebViewShell now lives in the chromium repository, so this patch removes it from the android checkout (see crbug.com/475084). Change-Id: I88dfc95eeb4597d38e936d2b13f801bbf5509fbb
2015-04-17Revert "GraphicsJNI update"John Reck
This reverts commit 260be08b742bf725cf92239c50f47a8c07280130. Change-Id: I4a50e890a63d22ff517ae1bd53f00bf05d8553ff
2015-04-17Return error code when failing to load webview relro file.Gustav Sennton
Instead of just returning a boolean representing whether the webview relro file loads successfully, return an integer representing either success or the reason for failure. Change-Id: Iade4044d130f0ac6b777f4e5d82f78b3cb977739
2015-04-14GraphicsJNI updateJohn Reck
Change-Id: I72a6721d1130e7e87372beed492b42ac613695b7
2015-04-07Merge "Removing jank tests from frameworks/webview."Allen Hair
2015-04-03Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I43945b554ef6bbe47cca355afbf95e9a376463af Auto-generated-cl: translation import
2015-03-30Removing jank tests from frameworks/webview.Allen Hair
These tests are now located in platform_testing/jank/webview. Change-Id: I99a6836a97f86822a2916f9b09a35bf305f3d524
2015-03-24Merge "Add WebViewBrowserActivity and cleanup to WebViewShell."Tim Volodine
2015-03-23Add WebViewBrowserActivity and cleanup to WebViewShell.Tim Volodine
Add activity for displaying urls for testing in WebViewShell. Also clean up some bits while at it. Change-Id: Id3a78328493be5ca2ebb0b9393f08387999315a7
2015-03-21Merge "Import translations. DO NOT MERGE"Geoff Mendal
2015-03-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I82411b0f588ae3a038eb8b732892a1d744e62f27 Auto-generated-cl: translation import
2015-03-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I15609e50219d9e215864733260698dfedd904428 Auto-generated-cl: translation import
2015-03-20am aeafafb7: Merge changes landed in master after lmp-dev creation.Torne (Richard Coles)
* commit 'aeafafb7fda87d35a53c321d89da2df1a0143ecd':