diff options
| author | Romain Guy <romainguy@android.com> | 2009-05-25 08:37:06 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-25 08:37:06 -0700 |
| commit | cc77c6bd6f2adf0ee26480deb1ff8923a7bfa891 (patch) | |
| tree | acea85710fa0e1590a6b402d818e11e25fb4ed6b /core/java/android/webkit/WebSettings.java | |
| parent | 94ded495ec4cfb6aef81098a1781608d95635531 (diff) | |
| parent | ff686ce11e952a9001b1384d8e7d82127b0529a2 (diff) | |
| download | frameworks_base-cc77c6bd6f2adf0ee26480deb1ff8923a7bfa891.zip frameworks_base-cc77c6bd6f2adf0ee26480deb1ff8923a7bfa891.tar.gz frameworks_base-cc77c6bd6f2adf0ee26480deb1ff8923a7bfa891.tar.bz2 | |
am ff686ce1: Change when gestures listeners are fired.
Merge commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2'
* commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2':
Change when gestures listeners are fired.
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
| -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 93ffcdb..e735292 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -127,7 +127,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; @@ -248,6 +248,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(); |