diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-05-25 16:57:15 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-05-25 16:57:15 +0900 |
| commit | c27d9b5341b29c1b58c882f0a04b4c519d8a9853 (patch) | |
| tree | 8852bf7970f246dc1ce84007a4a4ddc7436d29fc /core/java/android | |
| parent | 9399695aa27fd6da78eb2f7b8836fc3d9d58a85d (diff) | |
| download | frameworks_base-c27d9b5341b29c1b58c882f0a04b4c519d8a9853.zip frameworks_base-c27d9b5341b29c1b58c882f0a04b4c519d8a9853.tar.gz frameworks_base-c27d9b5341b29c1b58c882f0a04b4c519d8a9853.tar.bz2 | |
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 105eacd..dcba943 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -123,7 +123,7 @@ public class WebSettings { private String mSerifFontFamily = "serif"; private String mCursiveFontFamily = "cursive"; private String mFantasyFontFamily = "fantasy"; - private String mDefaultTextEncoding = "Latin-1"; + private String mDefaultTextEncoding; private String mUserAgent; private boolean mUseDefaultUserAgent; private String mAcceptLanguage; @@ -240,6 +240,8 @@ public class WebSettings { WebSettings(Context context) { mEventHandler = new EventHandler(); mContext = context; + mDefaultTextEncoding = context.getString(com.android.internal. + R.string.default_text_encoding); if (sLockForLocaleSettings == null) { sLockForLocaleSettings = new Object(); |