summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-29am ba3f200c: (-s ours) am b762bbe6: am 0c6c259a: Merge "Use overridden ↵Ben Murdoch
resources." into lmp-dev am: bd20dadd12 * commit 'bd20dadd12b3eb7df996443bdcb8f3230d48b4b3': Use overridden resources.
2015-10-29am 6fb047a8: (-s ours) Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba
am: a98405eca2 * commit 'a98405eca23f6412063bc0a004e0d18a2672193c': Match removal of config_webSettingsDefaultTextEncoding.
2015-10-29am 39781a2a: (-s ours) Reset the state of lmp-mr1-dev-plus-aosp to match ↵Primiano Tucci
lmp-dev-plus-aosp am: 977fa9efe1 * commit '977fa9efe1fb36dfb389f21211d483a4d40e1e7c': Webview: Remove dexpreopt flag Remove WebView DRP Setting from Developer Settings Suport initializing DRP from cmd line switches. Wrap all of the WebView Contexts WebView does not require a touch screen. Update WebView manifest to target/minSDK 21. Fix resource rewriting in apps with other shared libs. Use drawables instead of mipmap for WebView icon. WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base Update some content classes to content_public Don't declare WebView as a library.
2015-10-29am 0113e744: (-s ours) am df873b4a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
am: 8e01be4acb -s ours * commit '8e01be4acb3253cbc8ab6facf8c2184818020581': Import translations. DO NOT MERGE
2015-10-29am b17c1161: (-s ours) am adcbfb74: (-s ours) Merge "Import translations. DO ↵Baligh Uddin
NOT MERGE" into lmp-dev am: 98a9d85689 -s ours * commit '98a9d85689fb653364967aa571d262e299b55a35': Import translations. DO NOT MERGE
2015-10-29am 9aa2f10b: (-s ours) am a8cbb40a: Disable dex-preopt.Ying Wang
am: 26b7b26b3e * commit '26b7b26b3e450528be8972f59b32a7ac6dccbe86': Disable dex-preopt.
2015-10-29am 1a4c1664: (-s ours) am fae9ed9a: Merge "Match rename of ↵Marcin Kosiba
WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev am: 122d1a71f0 * commit '122d1a71f074cf217ab4c7be9e1cc417d54a3791': Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
2015-10-29am 8e6f4d6a: (-s ours) am a17d86e9: Don\'t use reflection to rewrite the ↵Marcin Kosiba
WebView resources. am: bf990ae2a5 * commit 'bf990ae2a587036cf21db5eb80a5d9b54c990e86': Don't use reflection to rewrite the WebView resources.
2015-10-29am 3b3a02d1: (-s ours) am 4510b8d1: Merge "Remove check for styleable ↵Ben Murdoch
resources in WebView ResourceRewriter." into lmp-dev am: f6a305dd30 * commit 'f6a305dd308709c756a228ed64e7d6f2196a7441': Remove check for styleable resources in WebView ResourceRewriter.
2015-10-29am 0d3c16f8: (-s ours) am 35716689: Implement FileChooserParams.createIntent ↵Tao Bai
and parseResult am: f44d74c435 * commit 'f44d74c435216fcdf13d11d4f53798a88f27f7a8': Implement FileChooserParams.createIntent and parseResult
2015-10-29am eb387421: (-s ours) am 98f9a279: Prepare for rename of ↵Marcin Kosiba
WebResourceRequest.hasUserGestureInsecure to hasGesture. am: 49b02d48d0 * commit '49b02d48d09a12a70789653a2a5b56d00ef39528': Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture.
2015-10-29am e41e1345: (-s ours) am 5b026de6: Remove the plumbing for ↵Selim Gurun
optOutDataReductionProxy API am: 6ca2fc89ac * commit '6ca2fc89acd0dc002c814f5710af5d90bb43623a': Remove the plumbing for optOutDataReductionProxy API
2015-10-29am 44d477c1: (-s ours) Remove the plumbing for optOutDataReductionProxy APISelim Gurun
am: de93e720ab * commit 'de93e720abc0f0d54f13a00575a5db376b6c8541': Remove the plumbing for optOutDataReductionProxy API
2015-10-29am 30808fe0: (-s ours) Skip commits up to 76399f9 from AOSP.Torne (Richard Coles)
am: e248b43f99 * commit 'e248b43f9904d3643626896757900de1a4761adc': Don't declare WebView as a library.
2015-10-29am a71fdd6c: (-s ours) Merge "Make init command line happen early"Torne (Richard Coles)
am: ee25a61b5d * commit 'ee25a61b5dea5296d7397df4d6507cd569858689': Make init command line happen early
2015-10-29am 98fae68c: (-s ours) Skip commits up to b20a4cb from AOSP.Torne (Richard Coles)
am: 95e900d8a0 * commit '95e900d8a06d741a0b0127020172e7544cf0a0f8': Don't use android.internal.R for resources. AOSP-only changes to support the WebView loading from an APK. Generate symlinks to libwebviewchromium.so in /system/priv-app Generate resources before running aapt. Include pak files in the WebView apk. Move WebView resources to separate APK Add com.android.webview to the package whitelist. Make the WebView Java library into an APK.
2015-10-29am 78e79ef7: (-s ours) Skip commits up to 2846d3c from AOSP.Torne (Richard Coles)
am: 254320149b * commit '254320149bf5883c671316114dae56691bd4c3ce': Change function table assignment to allow new fields Force software draws in AOSP Force software draws in AOSP Fix WebView crash on startup due to missing resource. Match API changes from http://crrev.com/284123004 Add plumbing for the new fullscreen video path. Make DrawGLFunctor work on 64-bit platforms.
2015-10-29am d59fae72: (-s ours) Update from lmp-dev.Torne (Richard Coles)
am: c2ab17cd3c * commit 'c2ab17cd3cf3fd86fb741fa118dcc8a3ce689c64': (51 commits) Suppress StrictMode warning reading command line file. Update API name to comply with changes to API Update WebView APK name. Cherry-pick: Remove debug logging. Disable building the APK when a prebuilt is in use. WebView fix for devices running <LRW48. Enable wrap_contents quirk for apps targetting pre-L SDK. Update WebViewFlingTest to use new UiAutomator API. Finish zoomBy API hookup. Do not read DRP key from GServices Delete profile data if the WebView is downgraded. Add version to public structs Set native pointers before initialization Add a trace event for AwBrowserProcess.loadLibrary. Generate version data for the WebView package. Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen. Fix merge_from_chromium.py script to work with new buildspec repo Increase char limit for private browsing warning. Start reading drp setting from GoogleSetting Revert version code to 1 ...
2015-10-29am e64f201d: (-s ours) am f250ae82: (-s ours) Merge "Merge up to 33b9fe6 ↵Torne (Richard Coles)
from chromium-dev." am: e1760e0969 * commit 'e1760e09693ac1b0a6f382e513915169033001f7': Update WebViewChromium to match http://crrev.com/274153002
2015-10-29am ddabdb61: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
am: 53fe47f347 -s ours * commit '53fe47f3475e13a61a7fc701c5e43c8410433880': Import translations. DO NOT MERGE
2015-10-29am 070f9117: (-s ours) Merge "Add Third Party Cookie API" into lmp-devHector Dearman
am: 3ef7df8e9b * commit '3ef7df8e9b89dbc131f8565965286e55f135e7e8': Add Third Party Cookie API
2015-10-29am 881717f6: (-s ours) Merge "Implement ↵Ben Murdoch
WebViewChromium.preauthorizePermission." into lmp-dev am: ae8ca01feb * commit 'ae8ca01feb9cdd0c66e79705fcffa78e1a785c26': Implement WebViewChromium.preauthorizePermission.
2015-10-27Merge from M up to 9ecaa9d.Torne (Richard Coles)
* commit '9ecaa9d5af42effca6b4701d70d234029d447a2e': Import translations. DO NOT MERGE Increment kAwDrawGLInfoVersion Import translations. DO NOT MERGE Remove no-longer-used webview glue sources. Change-Id: I7655ead2253a9598abfe960d152fbbcbd2bbb79c
2015-10-26Import translations. DO NOT MERGE am: 7102c3675f -s oursGeoff Mendal
am: ec4623ce5c -s ours * commit 'ec4623ce5c4d35869d6030c55d1b73de8f76bcc6': Import translations. DO NOT MERGE
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 MERGE am: bb3e2d9b51 -s oursGeoff Mendal
am: ba480fd949 -s ours * commit 'ba480fd949f1ad36469f7f866e5ed990cfcf54f2': Import translations. DO NOT MERGE
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 am: d2460a5c9d * commit 'd2460a5c9db4f157469d4bce1433c7131fda6b8f': Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. Always add the path to the WebView assets.
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-10-14Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I809aa4c2fb392db780d33256f899ec4324ee7d97 Auto-generated-cl: translation import
2015-09-29am 379c1660: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '379c16606cce7e903c4d8ff458fea79e34fc2299': Import translations. DO NOT MERGE
2015-09-29Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I4dfe698b18cff6df918a2806b7c52a8df059e98b Auto-generated-cl: translation import
2015-09-19am bbc58c8e: (-s ours) am 9bc58b22: (-s ours) am af710f26: (-s ours) Import ↵Baligh Uddin
translations. DO NOT MERGE * commit 'bbc58c8eda9f054c458c7b93f133d0bf03601314': Import translations. DO NOT MERGE
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-08-27am c51c0cce: (-s ours) am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'c51c0cceb60fa59ee99cba78ae4932cba5b13717':
2015-07-22Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I00c02b54c03ed2ad2a71724fb1fb78b03869b4bf Auto-generated-cl: translation import
2015-07-20Remove play store listing info.Torne (Richard Coles)
We translate this elsewhere now so it no longer needs to be in the Android tree. Change-Id: Ibfc56c114dfae31ebfaed69d59b0162aa87796b4
2015-07-15am d5242e10: (-s ours) am 74f2fe5f: (-s ours) am b2fd1224: (-s ours) am ↵Geoff Mendal
9ecaa9d5: (-s ours) Import translations. DO NOT MERGE * commit 'd5242e10bf52a998798286684d444f0ca0cd324c': Import translations. DO NOT MERGE
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-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