commit 26a892a0459e18707bc56c6f92f9167120db349e
author Android (Google) Code Review <android-gerrit@google.com> Mon May 25 00:58:57 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 25 00:58:57 2009 -0700
tree bc11b857147e49139a953f56074eba2444ad997b
parent 944ea123683b14225297d451c86e97fc73be3a02
parent c27d9b5341b29c1b58c882f0a04b4c519d8a9853

Merge change 2408 into donut

* changes:
  Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.

core/java/android/webkit/WebSettings.java

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 @@
     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 @@
     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();