Android: turn on auto-detect encoding by default

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences.website;
 
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
@@ skipping 24 matching lines @@
 public class SiteSettingsPreferences extends PreferenceFragment
         implements OnPreferenceClickListener {
     // The keys for each category shown on the Site Settings page.
     static final String ALL_SITES_KEY = "all_sites";
     static final String AUTOPLAY_KEY = "autoplay";
     static final String BACKGROUND_SYNC_KEY = "background_sync";
     static final String CAMERA_KEY = "camera";
     static final String COOKIES_KEY = "cookies";
     static final String FULLSCREEN_KEY = "fullscreen";
     static final String JAVASCRIPT_KEY = "javascript";
-    static final String LANGUAGE_KEY = "language";
     static final String LOCATION_KEY = "device_location";
     static final String MEDIA_KEY = "media";
     static final String MICROPHONE_KEY = "microphone";
     static final String NOTIFICATIONS_KEY = "notifications";
     static final String POPUPS_KEY = "popups";
     static final String PROTECTED_CONTENT_KEY = "protected_content";
+    static final String TRANSLATE_KEY = "translate";
     static final String STORAGE_KEY = "use_storage";
 
     static final String AUTOPLAY_MUTED_VIDEOS = "AutoplayMutedVideos";
 
     // Whether the Autoplay menu is available for display.
     boolean mAutoplayMenuAvailable = false;
 
     // Whether the Protected Content menu is available for display.
     boolean mProtectedContentMenuAvailable = false;
 
@@ skipping 61 matching lines @@
             getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
             getPreferenceScreen().removePreference(findPreference(CAMERA_KEY));
             getPreferenceScreen().removePreference(findPreference(COOKIES_KEY));
             getPreferenceScreen().removePreference(findPreference(FULLSCREEN_KEY));
             getPreferenceScreen().removePreference(findPreference(JAVASCRIPT_KEY));
             getPreferenceScreen().removePreference(findPreference(LOCATION_KEY));
             getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
             getPreferenceScreen().removePreference(findPreference(MICROPHONE_KEY));
             getPreferenceScreen().removePreference(findPreference(NOTIFICATIONS_KEY));
             getPreferenceScreen().removePreference(findPreference(POPUPS_KEY));
-            getPreferenceScreen().removePreference(findPreference(LANGUAGE_KEY));
             getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));
+            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
         } else {
             // If both Autoplay and Protected Content menus are available, they'll be tucked under
             // the Media key. Otherwise, we can remove the Media menu entry.
             if (!mAutoplayMenuAvailable || !mProtectedContentMenuAvailable) {
                 getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
 
                 if (!mAutoplayMenuAvailable) {
                     getPreferenceScreen().removePreference(findPreference(AUTOPLAY_KEY));
                 }
                 if (!mProtectedContentMenuAvailable) {
                     getPreferenceScreen().removePreference(findPreference(PROTECTED_CONTENT_KEY));
                 }
             } else {
                 // These two will be tucked under the Media subkey, so no reason to show them now.
                 getPreferenceScreen().removePreference(findPreference(AUTOPLAY_KEY));
                 getPreferenceScreen().removePreference(findPreference(PROTECTED_CONTENT_KEY));
             }
         }
     }
 
     private void updatePreferenceStates() {
         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
 
+        // Translate preference.
+        Preference translatePref = findPreference(TRANSLATE_KEY);
+        if (translatePref != null) {
+            setTranslateStateSummary(translatePref);
+        }
+
         // Preferences that navigate to Website Settings.
         List<String> websitePrefs = new ArrayList<String>();
         if (mMediaSubMenu) {
             websitePrefs.add(PROTECTED_CONTENT_KEY);
             websitePrefs.add(AUTOPLAY_KEY);
         } else {
             // When showing the main menu, only one of these two will be visible, at most.
             if (mProtectedContentMenuAvailable && !mAutoplayMenuAvailable) {
                 websitePrefs.add(PROTECTED_CONTENT_KEY);
             } else if (mAutoplayMenuAvailable && !mProtectedContentMenuAvailable) {
@@ skipping 83 matching lines @@
     // OnPreferenceClickListener:
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
         preference.getExtras().putString(
                 SingleCategoryPreferences.EXTRA_CATEGORY, preference.getKey());
         preference.getExtras().putString(SingleCategoryPreferences.EXTRA_TITLE,
                 preference.getTitle().toString());
         return false;
     }
+
+    private void setTranslateStateSummary(Preference translatePref) {
+        boolean translateEnabled = PrefServiceBridge.getInstance().isTranslateEnabled();
+        translatePref.setSummary(translateEnabled
+                ? R.string.website_settings_category_ask
+                : R.string.website_settings_category_blocked);
+    }
 }