diff options
| author | Marcin Kosiba <mkosiba@google.com> | 2014-10-10 16:51:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-10 16:51:12 +0000 |
| commit | 7d62eab4ca242beacac4471c002e998ef5c218b8 (patch) | |
| tree | f179b710702f4ba51ba6a0c9f672b95a3afec1e5 /chromium | |
| parent | 6ec46f2bd3243d042d9641d7f87863bc20f8c745 (diff) | |
| parent | 2de594d51a8134b7063dbdc365c68a8b752373b0 (diff) | |
| download | webview-7d62eab4ca242beacac4471c002e998ef5c218b8.tar.gz | |
Merge "Remove the default text encoding resource." into chromium-dev
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 2 | ||||
| -rw-r--r-- | chromium/res/values/strings.xml | 1 |
2 files changed, 0 insertions, 3 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/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> |