summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
Commit message (Expand)AuthorAgeFilesLines
* Merge "Change log msg since viewport can be changed before first layout."Shimeng (Simon) Wang2011-07-191-1/+3
|\
| * Change log msg since viewport can be changed before first layout.Shimeng (Simon) Wang2011-07-191-1/+3
* | I. Can. Not. Stand. ViewAncestor.Dianne Hackborn2011-07-181-2/+2
|/
* Merge "Add a hidden generic property interface"John Reck2011-07-152-0/+16
|\
| * Add a hidden generic property interfaceJohn Reck2011-07-152-0/+16
* | SearchBox API changes, to know when calls succeeded.Mathew Inwood2011-07-144-23/+96
* | Tile profiling interfaceChris Craik2011-07-131-0/+55
|/
* Add missing auto-fill strings.Ben Murdoch2011-07-121-1/+12
* Set mActualScale when initialScale is set.Shimeng (Simon) Wang2011-07-111-0/+2
* Merge "Prevent set mInitialScale being overridden by mDefaultScale."Shimeng (Simon) Wang2011-07-081-2/+3
|\
| * Prevent set mInitialScale being overridden by mDefaultScale.Shimeng (Simon) Wang2011-07-081-2/+3
* | Merge "NPE guard in setupViewport"John Reck2011-07-081-0/+4
|\ \
| * | NPE guard in setupViewportJohn Reck2011-07-081-0/+4
* | | Merge "Merge Chromium at r12.0.742.93: New autofill string"Kristian Monsen2011-07-081-1/+2
|\ \ \
| * | | Merge Chromium at r12.0.742.93: New autofill stringKristian Monsen2011-07-081-1/+2
| |/ /
* | | Merge "Update viewport asap."Shimeng (Simon) Wang2011-07-071-10/+9
|\ \ \
| * | | Update viewport asap.Shimeng (Simon) Wang2011-07-071-10/+9
| | |/ | |/|
* | | Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webki...Huahui Wu2011-07-072-82/+46
|\ \ \
| * | | Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."Huahui Wu2011-07-072-82/+46
* | | | Merge "b/3302378 Passes touch pressures, size and timestamps to webkit."Huahui Wu2011-07-072-46/+82
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | b/3302378 Passes touch pressures, size and timestamps to webkit.Huahui Wu2011-07-072-46/+82
* | | SearchBox API to determine if it's supported by the current page.Mathew Inwood2011-07-073-1/+53
|/ /
* | Merge "Treat restored defaultScale as overview."Shimeng (Simon) Wang2011-07-061-0/+6
|\ \
| * | Treat restored defaultScale as overview.Shimeng (Simon) Wang2011-07-061-0/+6
| |/
* | Merge "Clarify the documentation for WebView.loadDataWithBaseURL() when the b...Steve Block2011-07-051-5/+10
|\ \
| * | Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL...Steve Block2011-07-041-5/+10
* | | Merge "Maintain a reference to the Java object when WebView.removeJavascriptI...Steve Block2011-07-051-12/+20
|\ \ \ | |/ / |/| |
| * | Maintain a reference to the Java object when WebView.removeJavascriptInterfac...Steve Block2011-07-041-12/+20
* | | Merge "Clarify documentation for WebView.loadData()"Steve Block2011-07-041-8/+13
|\ \ \
| * | | Clarify documentation for WebView.loadData()Steve Block2011-07-041-8/+13
| |/ /
* | | Merge "Fix WebViewFragment to avoid detroying the WebView too early"Steve Block2011-07-041-4/+21
|\ \ \ | |_|/ |/| |
| * | Fix WebViewFragment to avoid detroying the WebView too earlySteve Block2011-07-011-4/+21
| |/
* | Merge "Release the media player when exiting the full screen"Teng-Hui Zhu2011-07-012-4/+17
|\ \
| * | Release the media player when exiting the full screenTeng-Hui Zhu2011-06-302-4/+17
* | | Merge changes I7e8401a4,I412ddf36Kristian Monsen2011-07-011-1/+5
|\ \ \ | |/ / |/| |
| * | Merge Chromium at r11.0.696.0: New autofill stringsKristian Monsen2011-06-301-1/+5
* | | Merge "Keep initial zoom overview for non-standard load."Shimeng (Simon) Wang2011-06-302-0/+13
|\ \ \
| * | | Keep initial zoom overview for non-standard load.Shimeng (Simon) Wang2011-06-302-0/+13
* | | | Merge "Use default scale when restored scale is 0."Shimeng (Simon) Wang2011-06-301-2/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Use default scale when restored scale is 0.Shimeng (Simon) Wang2011-06-301-2/+3
| |/
* | Merge "KeyChain API for credential installation"Brian Carlstrom2011-06-291-10/+6
|\ \
| * | KeyChain API for credential installationBrian Carlstrom2011-06-291-10/+6
| |/
* | Merge "Initial zoom overview flag only meaningful in page overview mode."Shimeng (Simon) Wang2011-06-291-1/+2
|\ \
| * | Initial zoom overview flag only meaningful in page overview mode.Shimeng (Simon) Wang2011-06-291-1/+2
| |/
* | Merge "Media player should be paused while the surface is still alive"Teng-Hui Zhu2011-06-291-3/+6
|\ \ | |/ |/|
| * Media player should be paused while the surface is still aliveTeng-Hui Zhu2011-06-291-3/+6
* | 2nd try: Gets the URL that has a cert error and carrys it in SslError.Huahui Wu2011-06-281-2/+3
* | Merge "Revert "Gets the URL that has a cert error and carrys it in SslError.""Huahui Wu2011-06-281-3/+2
|\ \
| * | Revert "Gets the URL that has a cert error and carrys it in SslError."Huahui Wu2011-06-281-3/+2
* | | Merge "Gets the URL that has a cert error and carrys it in SslError."Huahui Wu2011-06-281-2/+3
|\ \ \ | |/ / | | / | |/ |/|