summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
Commit message (Expand)AuthorAgeFilesLines
* am b993a4c7: am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to ...Ignacio Solla2014-11-1423-603/+277
|\
| * am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled a...Ignacio Solla2014-11-1323-603/+277
| |\
| | * [WebView] Allow the WebView to be compiled against the system SDK.Ignacio Solla2014-11-1223-603/+277
* | | am 4fc66e58: am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into l...Ignacio Solla2014-11-131-1/+1
|\ \ \ | |/ /
| * | am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-devIgnacio Solla2014-11-121-1/+1
| |\ \ | | |/
| | * Fix docs build breakageIgnacio Solla2014-11-121-1/+1
* | | am fd003c70: am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access h...Ignacio Solla2014-11-122-1/+167
|\ \ \ | |/ /
| * | am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." ...Ignacio Solla2014-11-122-1/+167
| |\ \ | | |/
| | * [WebView] Interface to access hidden APIs.Ignacio Solla2014-11-102-1/+167
* | | am 103817ed: am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remov...Marcin Kosiba2014-10-131-1/+2
|\ \ \ | |/ /
| * | am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default...Marcin Kosiba2014-10-131-1/+2
| |\ \ | | |/
| | * Remove the default WebView text encoding resource entirely.Marcin Kosiba2014-10-101-1/+2
* | | am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put i...Dianne Hackborn2014-10-103-6/+4
|\ \ \ | |/ /
| * | am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code"...Dianne Hackborn2014-10-103-6/+4
| |\ \ | | |/
| | * Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-073-6/+4
* | | am 0fdb1651: am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Rever...Hui Shu2014-10-021-0/+9
|\ \ \ | |/ /
| * | am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove Web...Hui Shu2014-10-021-0/+9
| |\ \ | | |/
| | * Revert "Remove WebView DRP Setting from Developer Settings"Hui Shu2014-10-011-0/+9
* | | am 30c284fc: am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remov...Hui Shu2014-10-021-9/+0
|\ \ \ | |/ /
| * | am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP...Hui Shu2014-10-021-9/+0
| |\ \ | | |/
| | * Remove WebView DRP Setting from Developer SettingsHui Shu2014-09-301-9/+0
* | | Disallow passing a StringBufferInputStream to a WebResourceResponsePaul Miller2014-09-151-4/+14
|/ /
* | am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebReso...Marcin Kosiba2014-09-121-10/+1
|\ \ | |/
| * Remove an @removed member of andorid.webkit.WebResourceResponse.Marcin Kosiba2014-09-121-10/+1
* | am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." in...Tao Bai2014-09-102-37/+40
|\ \ | |/
| * Revise createIntent and parseResult API.Tao Bai2014-09-092-37/+40
* | resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aospElliott Hughes2014-09-081-1/+1
|\ \ | |/ |/|
| * Merge "Small documentation fixes across many files."Elliott Hughes2014-09-081-1/+1
| |\
| | * Small documentation fixes across many files.Mark Doliner2014-09-051-1/+1
| * | Update WebViewFactory.java to compile in AOSP.Marcin Kosiba2014-08-051-2/+6
| * | Load the WebView Java code via createPackageContext.Torne (Richard Coles)2014-08-051-1/+14
| * | Remove WebView library preloading mechanism.Torne (Richard Coles)2014-08-051-20/+0
| |/
| * Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-292-0/+14
| |\
* | \ Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into ...Marcin Kosiba2014-09-051-1/+6
|\ \ \
| * | | Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.Marcin Kosiba2014-09-051-1/+6
* | | | Change WebView.zoomBy return type to void.Martin Kosiba2014-09-051-4/+2
|/ / /
* | | Remove unpublished optOutDataReductionProxyApiSelim Gurun2014-09-032-21/+0
* | | Merge "Address API Feedback" into lmp-devSelim Gurun2014-08-283-14/+27
|\ \ \
| * | | Address API FeedbackSelim Gurun2014-08-273-14/+27
* | | | Remove synchronized from acceptThirdPartyCookies()Hector Dearman2014-08-261-1/+1
|/ / /
* | | Store the WebView's package info.Torne (Richard Coles)2014-08-141-3/+8
* | | Merge "Add trace events to WebView startup." into lmp-devTorne (Richard Coles)2014-08-121-19/+37
|\ \ \
| * | | Add trace events to WebView startup.Torne (Richard Coles)2014-08-131-19/+37
* | | | am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: ...Robert Ly2014-08-131-4/+8
|\ \ \ \ | |/ / / |/| | |
| * | | am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security cons...Robert Ly2014-08-131-4/+8
| |\ \ \
| | * | | cherrypick from klp-docs docs: security consideration for Android <4.2 Change...Scott Rowe2014-08-071-4/+8
* | | | | Make WebViewFactory more robust.Torne (Richard Coles)2014-08-081-26/+30
* | | | | Merge "Log the version of the WebView package used." into lmp-devTorne (Richard Coles)2014-08-051-2/+9
|\ \ \ \ \
| * | | | | Log the version of the WebView package used.Torne (Richard Coles)2014-08-051-2/+9
* | | | | | Merge "Fix CookieSyncManager package summary" into lmp-devHector Dearman2014-08-051-7/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |