diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-25 00:58:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-25 00:58:57 -0700 |
| commit | 26a892a0459e18707bc56c6f92f9167120db349e (patch) | |
| tree | bc11b857147e49139a953f56074eba2444ad997b /core/java/android | |
| parent | 944ea123683b14225297d451c86e97fc73be3a02 (diff) | |
| parent | c27d9b5341b29c1b58c882f0a04b4c519d8a9853 (diff) | |
| download | frameworks_base-26a892a0459e18707bc56c6f92f9167120db349e.zip frameworks_base-26a892a0459e18707bc56c6f92f9167120db349e.tar.gz frameworks_base-26a892a0459e18707bc56c6f92f9167120db349e.tar.bz2 | |
Merge change 2408 into donut
* changes:
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(); |