summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix typo in WebSettings javadoc."Torne (Richard Coles)2015-03-061-2/+2
|\
| * Fix typo in WebSettings javadoc.Torne (Richard Coles)2015-03-061-2/+2
* | Provide better error reporting for WebViewMikhail Naganov2015-03-064-25/+160
* | Fix build: Revert "Add potential future APIs for postmessage"Ed Heyl2015-03-024-184/+0
* | am 4de38166: am aef98356: am 9fc8356b: Merge "Add potential future APIs for p...Selim Gurun2015-03-024-0/+184
|\ \
| * \ am 9fc8356b: Merge "Add potential future APIs for postmessage"Selim Gurun2015-03-024-0/+184
| |\ \
| | * | Add potential future APIs for postmessageSelim Gurun2015-03-024-0/+184
* | | | Remove unused imports in frameworks/base.John Spurlock2015-02-287-12/+0
| |_|/ |/| |
* | | Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-121-17/+16
* | | First quick implementation of auto assist data.Dianne Hackborn2015-02-061-2/+4
* | | Merge "Update docs to say onPageStarted is not called for fragment navigations."Marcin Kosiba2015-02-021-1/+3
|\ \ \
| * | | Update docs to say onPageStarted is not called for fragment navigations.Marcin Kosiba2015-01-271-1/+3
* | | | Update docs for WebResourceRequest.hasUserGesture.Marcin Kosiba2015-01-271-0/+2
|/ / /
* | | Merge "[WebView] Improve documentation around full screen mode."Ignacio Solla2015-01-222-16/+26
|\ \ \
| * | | [WebView] Improve documentation around full screen mode.Ignacio Solla2015-01-222-16/+26
* | | | Un-break the WebView build.Marcin Kosiba2015-01-082-7/+7
* | | | Merge "Fix accessibility delegation"Alan Viverette2015-01-082-13/+16
|\ \ \ \
| * | | | Fix accessibility delegationAlan Viverette2015-01-072-13/+16
| |/ / /
* | | | am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#...Ben Murdoch2015-01-071-5/+6
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWho...Ben Murdoch2015-01-071-5/+6
| |\ \
| | * | Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.Ben Murdoch2015-01-071-5/+6
* | | | Add WebView documentation about the layout height parameter.Marcin Kosiba2014-12-151-0/+28
* | | | Update CookieManager documentationPaul Miller2014-12-121-4/+1
* | | | am f1459604: am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apa...Narayan Kamath2014-11-272-2/+101
|\ \ \ \ | |/ / /
| * | | am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."Narayan Kamath2014-11-272-2/+101
| |\ \ \ | | | |/ | | |/|
| | * | Stop using ErrorStrings for apache.Narayan Kamath2014-11-272-2/+101
| | * | [WebView] Allow the WebView to be compiled against the system SDK.Ignacio Solla2014-11-2523-603/+277
| | * | [WebView] Interface to access hidden APIs. (DO NOT MERGE)Ignacio Solla2014-11-192-1/+167
| | * | am 43751757: Merge "Remove the default WebView text encoding resource entirel...Marcin Kosiba2014-10-131-1/+2
| | |\ \
| | * \ \ am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-083-6/+4
| | |\ \ \
| | * \ \ \ am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Setting...Hui Shu2014-10-011-0/+9
| | |\ \ \ \
| | * \ \ \ \ am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into ...Hui Shu2014-10-011-9/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge "[WebView] Remove fallback call to WebViewFactoryProvider no-arg constr...Ignacio Solla2014-11-271-6/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [WebView] Remove fallback call to WebViewFactoryProvider no-arg constructor.Ignacio Solla2014-11-131-6/+2
* | | | | | | | | resolved conflicts for merge of 18e3727f to masterNarayan Kamath2014-11-211-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-devJohn Reck2014-11-211-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Rename callDrawGLFunctionJohn Reck2014-11-201-1/+1
* | | | | | | | | am b536c7a6: am 27936ad3: Merge "Block loading WebView in privileged processe...Jeff Sharkey2014-11-141-3/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-...Jeff Sharkey2014-11-141-3/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Block loading WebView in privileged processes." into lmp-mr1-devJeff Sharkey2014-11-141-3/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Block loading WebView in privileged processes.Jeff Sharkey2014-11-141-3/+9
* | | | | | | | | | 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
| | | |_|_|_|/ | | |/| | | |