Jean-Baptiste Queru e69f1f1a74 resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp ...

Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea

2010-10-11 09:38:10 -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

…

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

…

ContentLoader.java

…

CookieManager.java

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

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

CookieSyncManager.java

…

DataLoader.java

…

DateSorter.java

…

DebugFlags.java

…

DownloadListener.java

…

EventLogTags.logtags

…

FileLoader.java

…

FrameLoader.java

Fix for 2585858, load invalid urls.

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

GeolocationPermissions.java

…

GeolocationService.java

…

HTML5VideoViewProxy.java

Make sure the onended event is dispatched even when

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

HttpAuthHandler.java

…

JsPromptResult.java

…

JsResult.java

…

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

…

StreamLoader.java

…

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

…

WebBackForwardListClient.java

…

WebChromeClient.java

DO NOT MERGE Refactor find and select dialogs

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

WebHistoryItem.java

…

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

…

WebSyncManager.java

…

WebTextView.java

Remove the WebTextView if it is drawing when it shouldn't.

2010-04-22 17:09:24 -04:00

WebView.java

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

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

WebViewClient.java

…

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

…