commit 95b7968be0c65c57faf8469a404d2b0495b608e4
author Tarun Nainani <tnainani@codeaurora.org> Tue Dec 09 09:38:04 2014 -0800
committer WebTech Code Review <code-review@localhost> Thu Dec 11 09:33:53 2014 -0800
tree 7178c5a6a11dfcbb875d2a2d88fea71de0ec05a9
parent 1559a927ae60572e5235a52bbf93388804bc9037

Enable auto text encoding

Set locale specific text encoding for Chinese, Japanese,
Korean and keep "UTF-8" encoding as default for all other
locales.

Add "Auto detect" (localized for Chinese only) as additional
list item for "Text Encoding" list preference.

Change-Id: Ic33287f6999e2741dce57eb3fb7adc66f3fb0b9f

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 4d7bc55..975ae89 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -211,7 +211,7 @@
             sFactoryResetUrl = mContext.getResources().getString(R.string.homepage_base);
 
             if (!mPrefs.contains(PREF_DEFAULT_TEXT_ENCODING)) {
-                mPrefs.edit().putString(PREF_DEFAULT_TEXT_ENCODING, "UTF-8").apply();
+                mPrefs.edit().putString(PREF_DEFAULT_TEXT_ENCODING, "auto").apply();
             }
 
             if (sFactoryResetUrl.indexOf("{CID}") != -1) {
@@ -776,7 +776,11 @@
     }
 
     public String getDefaultTextEncoding() {
-        return mPrefs.getString(PREF_DEFAULT_TEXT_ENCODING, null);
+        String autoDetect = mPrefs.getString(PREF_DEFAULT_TEXT_ENCODING, "auto");
+        if(autoDetect.equalsIgnoreCase("auto")) {
+            return mContext.getResources().getString(R.string.pref_default_text_encoding_default);
+        }
+        return autoDetect;
     }
 
     // -----------------------------