diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-27 17:56:26 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-10-27 17:56:26 +0000 |
| commit | a54ab0ff25cba326b535c57ee710f5b39760c0be (patch) | |
| tree | f179b710702f4ba51ba6a0c9f672b95a3afec1e5 | |
| parent | 5cdf02141e137e7094b3f7220571e5a53a7706f0 (diff) | |
| parent | 7d62eab4ca242beacac4471c002e998ef5c218b8 (diff) | |
| download | android_frameworks_webview-a54ab0ff25cba326b535c57ee710f5b39760c0be.tar.gz android_frameworks_webview-a54ab0ff25cba326b535c57ee710f5b39760c0be.tar.bz2 android_frameworks_webview-a54ab0ff25cba326b535c57ee710f5b39760c0be.zip | |
Merge chromium-dev up to 7d62eab
3 files changed, 2 insertions, 4 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 8bde8d6..16a9f81 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -266,8 +266,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { AwResource.setResources(getWebViewPackageResources(ctx)); AwResource.setErrorPageResources(R.raw.webviewchromium_loaderror, R.raw.webviewchromium_nodomain); - AwResource.setDefaultTextEncoding( - R.string.webviewchromium_default_text_encoding); AwResource.setConfigKeySystemUuidMapping( R.array.config_keySystemUuidMapping); } diff --git a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java index 50f4422..c973d55 100644 --- a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java +++ b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java @@ -830,8 +830,9 @@ public class WebViewContentsClientAdapter extends AwContentsClient { if (result == null) { // The ic_media_video_poster icon is transparent so we need to draw it on a gray // background. + Context ctx = ResourcesContextWrapperFactory.get(mWebView.getContext()); Bitmap poster = BitmapFactory.decodeResource( - mWebView.getContext().getResources(), + ctx.getResources(), R.drawable.ic_media_video_poster); result = Bitmap.createBitmap(poster.getWidth(), poster.getHeight(), poster.getConfig()); result.eraseColor(Color.GRAY); diff --git a/chromium/res/values/strings.xml b/chromium/res/values/strings.xml index bc47002..bb42490 100644 --- a/chromium/res/values/strings.xml +++ b/chromium/res/values/strings.xml @@ -9,5 +9,4 @@ <!-- Contextual action bar item for sharing a block of text via email, or other method. [CHAR-LIMIT=24] --> <string name="webviewchromium_private_browsing_warning">This functionality is not supported in this version of Android.</string> - <string name="webviewchromium_default_text_encoding">UTF-8</string> </resources> |