Leon Scroggins 00c50b2e49 am f348502c: Merge "Allow TextView to do its thing." into gingerbread ...

Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp

* commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
  Allow TextView to do its thing.

2010-10-12 11:23:12 -07:00

..

BrowserFrame.java

Do not merge: cherry-pick a fix for a npe.

2010-09-22 09:46:33 -04:00

ByteArrayBuilder.java

…

CacheLoader.java

Fix for when flash loads cached crossdomain.xml files.

2010-03-23 18:36:58 +00:00

CacheManager.java

Fix the last remaining @deprecated tag without comment warning.

2010-09-10 15:01:35 -04:00

CallbackProxy.java

Do not merge: cherry-pick a fix for a npe.

2010-09-22 09:46:33 -04:00

CertTool.java

…

ConsoleMessage.java

Add new ConsoleMessage class that adds more information (such as the Message Log Level from WebCore) and a new overload of onConsoleMessage that takes this as a parameter.

2010-02-04 10:44:18 +00:00

ContentLoader.java

Enable StreamLoader to be loaded in a separate thread.

2010-02-04 08:59:10 -08:00

CookieManager.java

Move the public method HttpDateTime.parse() into AndroidHttpClient.

2010-04-09 13:34:15 -07:00

CookieSyncManager.java

…

DataLoader.java

Enable StreamLoader to be loaded in a separate thread.

2010-02-04 08:59:10 -08:00

DateSorter.java

Change the text for the browser downloads and history views.

2010-02-22 09:13:57 -05:00

DebugFlags.java

…

DownloadListener.java

…

EventLogTags.logtags

Eliminate dependencies on Checkin, replacing checkin events with EventLog

2010-02-11 10:22:09 -08:00

FileLoader.java

Enable StreamLoader to be loaded in a separate thread.

2010-02-04 08:59:10 -08:00

FrameLoader.java

Fix for 2585858, load invalid urls.

2010-04-13 16:48:32 +01:00

GeolocationPermissions.java

Makes sure GeolocationPermissions is fully robust to calls being made before the message handler is initialized

2010-02-19 16:26:41 +00:00

GeolocationService.java

…

HTML5VideoViewProxy.java

Make sure the onended event is dispatched even when

2010-04-14 17:31:17 +01:00

HttpAuthHandler.java

Cherry pick from master.

2010-04-01 16:19:39 +01:00

JsPromptResult.java

…

JsResult.java

Hide the android.webkit.CallbackProxy class from the API. This is a android.webkit package class and internal to our implementation.

2010-02-02 10:30:23 -08:00

JWebCoreJavaBridge.java

DO NOT MERGE

2010-09-13 10:47:58 -07:00

LoadListener.java

Added the subset of partial content support so that

2010-04-22 09:51:18 -07:00

MimeTypeMap.java

merge from open-source master

2010-06-09 12:17:03 -07:00

MockGeolocation.java

…

Network.java

…

package.html

…

PerfChecker.java

…

Plugin.java

…

PluginData.java

…

PluginFullScreenHolder.java

Update the comment which supposed to be checked in

2010-04-19 16:05:19 -07:00

PluginList.java

…

PluginManager.java

Support pre-loading browser plugins on the system image.

2010-08-27 11:10:36 -04:00

PluginStub.java

…

SslErrorHandler.java

Store the LoadListener in the SslErrorHandler passed to the client.

2010-02-26 15:23:36 -05:00

StreamLoader.java

Add a new WebCoreWorker thread to handle the tasks

2010-03-01 10:36:15 -08:00

UrlInterceptHandler.java

…

UrlInterceptRegistry.java

…

URLUtil.java

…

ValueCallback.java

…

ViewManager.java

Post a message to set SurfaceView to be visible when

2010-04-21 21:23:30 -07:00

WebBackForwardList.java

Add a client for WebBackForwardList operations.

2010-03-02 14:28:07 -05:00

WebBackForwardListClient.java

Add a client for WebBackForwardList operations.

2010-03-02 14:28:07 -05:00

WebChromeClient.java

DO NOT MERGE Refactor find and select dialogs

2010-08-20 12:28:19 -04:00

WebHistoryItem.java

Add a client for WebBackForwardList operations.

2010-03-02 14:28:07 -05:00

WebIconDatabase.java

Add a bulk request method for bookmark icons.

2010-04-12 14:26:13 -04:00

WebSettings.java

DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml

2010-09-01 19:04:18 -07:00

WebStorage.java

Implements layoutTestController.setAppCacheMaximumSize

2010-03-20 11:03:53 +00:00

WebSyncManager.java

…

WebTextView.java

Allow TextView to do its thing.

2010-10-12 09:52:56 -04:00

WebView.java

resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp

2010-10-11 09:38:10 -07:00

WebViewClient.java

Cherry pick from master.

2010-04-01 16:19:39 +01:00

WebViewCore.java

DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.

2010-09-01 09:01:48 -04:00

WebViewDatabase.java

Fix npe in getCacheTotalSize.

2010-08-11 09:48:43 -04:00

WebViewWorker.java

Add a new WebCoreWorker thread to handle the tasks

2010-03-01 10:36:15 -08:00