diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java index c271356..928c73e 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java @@ -59,8 +59,7 @@ public class AwSettings { private String mSerifFontFamily = "serif"; private String mCursiveFontFamily = "cursive"; private String mFantasyFontFamily = "fantasy"; - // TODO(mnaganov): Should be obtained from Android. Problem: it is hidden. - private String mDefaultTextEncoding = "Latin-1"; + private String mDefaultTextEncoding; private String mUserAgent; private int mMinimumFontSize = 8; private int mMinimumLogicalFontSize = 8; @@ -214,6 +213,7 @@ public class AwSettings { mAllowFileAccessFromFileURLs = true; } + mDefaultTextEncoding = AwResource.getDefaultTextEncoding(); mUserAgent = LazyDefaultUserAgent.sInstance; // Best-guess a sensible initial value based on the features supported on the device. 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; } |