diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 21:49:34 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 21:49:34 +0000 |
| commit | f69f9528e227f48ce7c5bef6d482ff85316b6c2a (patch) | |
| tree | 40e4741a2402c8c963882f8efd3a525c9847afb9 /android_webview/test | |
| parent | e5c8f005def0b5b7a93bf182ee8fc951e44a6a0a (diff) | |
| download | chromium_src-f69f9528e227f48ce7c5bef6d482ff85316b6c2a.zip chromium_src-f69f9528e227f48ce7c5bef6d482ff85316b6c2a.tar.gz chromium_src-f69f9528e227f48ce7c5bef6d482ff85316b6c2a.tar.bz2 | |
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
Diffstat (limited to 'android_webview/test')
| -rw-r--r-- | android_webview/test/shell/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java | 2 |
2 files changed, 2 insertions, 2 deletions
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. --> <resources> - <string name="test_string">Hello, World!</string> + <string name="default_encoding">Latin-1</string> </resources> 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; } |