summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |_|_|_|/ | | |/| | | |
* | | | | | | 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
|\ \ | |/ |/|