summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
Commit message (Expand)AuthorAgeFilesLines
* Merge "Provide an API to set print document name."Selim Gurun2014-04-182-5/+17
|\
| * Provide an API to set print document name.Selim Gurun2014-03-172-5/+17
* | Merge "Revert "Revert "Define new general permission APIs for webview."""Ben Murdoch2014-04-164-0/+117
|\ \
| * | Revert "Revert "Define new general permission APIs for webview.""Tao Bai2014-04-154-0/+117
* | | Merge "Revert "Define new general permission APIs for webview.""Tao Bai2014-04-154-117/+0
|\ \ \ | |/ /
| * | Revert "Define new general permission APIs for webview."Tao Bai2014-04-154-117/+0
* | | Merge "Define new general permission APIs for webview."Tao Bai2014-04-154-0/+117
|\ \ \ | |/ /
| * | Define new general permission APIs for webview.Tao Bai2014-04-104-0/+117
| |/
* | Add Javadoc statement regarding enumerability of methods of injected JavaMikhail Naganov2014-04-111-0/+3
|/
* Switch WebView to onDetachedFromWindowInternalJohn Reck2014-03-061-2/+3
* Fix postUrl to call loadUrl when url is not a network url.Hui Shu2014-02-051-3/+7
* Remove defunct flagSelim Gurun2014-01-271-1/+0
* Remove unused imports from frameworks/base.John Spurlock2013-11-207-14/+0
* am 72950e65: am d47be031: am 43e533de: Merge "Restore 4 classes that were acc...Jonathan Dixon2013-10-184-0/+709
|\
| * Restore 4 classes that were accidentally deletedJonathan Dixon2013-10-184-0/+709
* | resolved conflicts for merge of f96b93e2 to masterTorne (Richard Coles)2013-10-1555-29801/+0
|\ \ | |/
| * Delete the old WebView.Torne (Richard Coles)2013-10-1555-29789/+0
* | Resolved conflicts for merge of db931a3b to masterTorne (Richard Coles)2013-10-151-56/+10
|\ \
| * \ am a1ba29ac: am d892afc8: Remove support for switching WebView.Torne (Richard Coles)2013-10-151-28/+3
| |\ \ | | |/
| | * Remove support for switching WebView.Torne (Richard Coles)2013-10-151-28/+3
* | | Fix build after checkThread fix merge to masterJonathan Dixon2013-10-091-1/+0
* | | am 1bb6a7dc: am a8137c0c: am b1b2789d: Merge "Do not require WebView usage to...Jonathan Dixon2013-10-091-9/+10
|\ \ \ | |/ /
| * | am a8137c0c: am b1b2789d: Merge "Do not require WebView usage to come from ma...Jonathan Dixon2013-10-091-9/+10
| |\ \ | | |/
| | * Do not require WebView usage to come from main threadJonathan Dixon2013-10-091-9/+10
| * | am 0544b872: am facf26c0: Merge "Hide Experimental WebView from dev settings ...Torne (Richard Coles)2013-10-081-32/+11
| |\ \ | | |/
| | * Hide Experimental WebView from dev settings DO NOT MERGEJonathan Dixon2013-10-081-32/+11
* | | am 3bd13f3a: am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassicJonathan Dixon2013-10-041-0/+4
|\ \ \ | |/ /
| * | am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassicJonathan Dixon2013-10-041-0/+4
| |\ \ | | |/
| | * Fix CookieSyncManager for WebViewClassicJonathan Dixon2013-10-041-0/+4
* | | am 34eb4f3d: am 4730dda8: am 46507f4b: Merge "Decouple construction of WebVie...Jonathan Dixon2013-10-043-24/+32
|\ \ \ | |/ /
| * | am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSync...Jonathan Dixon2013-10-033-24/+32
| |\ \ | | |/
| | * Decouple construction of WebView, CookieSyncManager, WebViewDatabaseJonathan Dixon2013-10-033-24/+32
* | | am dc7053be: am 4e31b804: Merge "Update WebView documentation section about z...Martin Kosiba2013-09-241-4/+11
|\ \ \ | |/ /
| * | am 4e31b804: Merge "Update WebView documentation section about zoom." into kl...Martin Kosiba2013-09-241-4/+11
| |\ \ | | |/
| | * Merge "Update WebView documentation section about zoom." into klp-devMartin Kosiba2013-09-241-4/+11
| | |\
| | | * Update WebView documentation section about zoom.Martin Kosiba2013-09-201-4/+11
* | | | resolved conflicts for merge of 1421827b to masterJonathan Dixon2013-09-213-0/+27
|\ \ \ \ | |/ / /
| * | | am 6c025eaf: Merge "WebView: add an API method to control web contents debugg...Jonathan Dixon2013-09-203-0/+27
| |\ \ \ | | |/ /
| | * | Merge "WebView: add an API method to control web contents debugging" into klp...Jonathan Dixon2013-09-213-0/+27
| | |\ \ | | | |/ | | |/|
| | | * WebView: add an API method to control web contents debuggingMikhail Naganov2013-09-113-0/+27
* | | | Merge "Trace extra headers set by loadurl."Selim Gurun2013-09-211-1/+9
|\ \ \ \
| * | | | Trace extra headers set by loadurl.Selim Gurun2013-09-201-1/+9
* | | | | am 515134e8: am c7969dea: Merge "Fix obsolete API reference" into klp-devJonathan Dixon2013-09-181-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am c7969dea: Merge "Fix obsolete API reference" into klp-devJonathan Dixon2013-09-181-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix obsolete API referenceJonathan Dixon2013-09-181-1/+1
* | | | | am b7bdf38b: am 01fc0884: Merge "Update APIs for the Chromium WebView" into k...Jonathan Dixon2013-09-184-14/+40
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-devJonathan Dixon2013-09-184-14/+40
| |\ \ \ | | |/ /
| | * | Update APIs for the Chromium WebViewJonathan Dixon2013-09-174-14/+40
| * | | am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO N...Jonathan Dixon2013-09-151-11/+32
| |\ \ \ | | |/ /
| | * | Revert "Hide Experimental WebView from dev settings" DO NOT MERGEJonathan Dixon2013-09-161-11/+32