commit 22bd57baa9c3aa9437032438512eb996e156beb3
author Vivek Sekhar <vsekhar@codeaurora.org> Sat Apr 05 22:19:43 2014 -0700
committer WebTech Code Review <code-review@localhost> Sun Apr 06 17:35:42 2014 -0700
tree c998268f1df2850e86ab99dfc0632904889cc7d6
parent 244dc4635f1a43673d3a5a716639db7b2ba6e6b3

Default encoding to UTF-8

Change-Id: Ie853d0b1a77406498494efd7b7f527780c9678d3

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 96823e9..ce295bb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -640,7 +640,7 @@
         <item>EUC-JP</item>
         <item>EUC-KR</item>
     </string-array>
-    <string name="pref_default_text_encoding_default" translatable="false">Latin-1</string>
+    <string name="pref_default_text_encoding_default" translatable="false">UTF-8</string>
     <!-- Title for accessibility settings [CHAR LIMIT=25] -->
     <string name="pref_accessibility_title">Accessibility</string>
     <!-- Font size settings category under accessibility settings [CHAR LIMIT=50] -->

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 8456045..319ded5 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -308,7 +308,7 @@
             if (!mPrefs.contains(PREF_DEFAULT_TEXT_ENCODING)) {
                 if (!"default".equals(browserRes)) {
                     mPrefs.edit().putString(PREF_DEFAULT_TEXT_ENCODING,
-                            "GBK").apply();
+                            "UTF-8").apply();
                 }
             }
             if (sFactoryResetUrl.indexOf("{CID}") != -1) {