From f69f9528e227f48ce7c5bef6d482ff85316b6c2a Mon Sep 17 00:00:00 2001 From: "mnaganov@chromium.org" Date: Fri, 7 Feb 2014 21:49:34 +0000 Subject: Retrieve AwSettings.defaultTextEncoding from AwResource A long-standing TODO that I have almost forgotten about. WebView Classic was using com.android.internal.R.string.default_text_encoding as the initial value. In our case, this value is propagated via AwResource. Review URL: https://codereview.chromium.org/145483010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249799 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/test/shell/res/values/strings.xml | 2 +- .../src/org/chromium/android_webview/shell/AwShellResourceProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'android_webview/test') diff --git a/android_webview/test/shell/res/values/strings.xml b/android_webview/test/shell/res/values/strings.xml index 6b4e2ab..a62403f 100644 --- a/android_webview/test/shell/res/values/strings.xml +++ b/android_webview/test/shell/res/values/strings.xml @@ -7,5 +7,5 @@ found in the LICENSE file. --> - Hello, World! + Latin-1 diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java index d42692f..dd54ad3 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java @@ -23,7 +23,7 @@ public class AwShellResourceProvider { AwResource.setErrorPageResources(R.raw.blank_html, R.raw.blank_html); - AwResource.setDefaultTextEncoding(R.string.test_string); + AwResource.setDefaultTextEncoding(R.string.default_encoding); sInitialized = true; } -- cgit v1.1