From fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 21 Aug 2014 11:41:57 +0900
Subject: [PATCH] Remove "Choose Keyboards" settings

Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
---
 res/values/strings.xml                                   | 2 --
 res/xml/language_settings.xml                            | 6 ------
 .../inputmethod/InputMethodAndLanguageSettings.java      | 9 ---------
 3 files changed, 17 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f73840a5b3e..c2799bad8b3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3339,8 +3339,6 @@
     <string name="input_methods_settings_title">Text input</string>
     <!-- Setting name for Input Method chooser -->
     <string name="input_method">Input method</string>
-    <!-- Title for the option to press to enable or disable keyboards, also known as input methods [CHAR LIMIT=35] -->
-    <string name="choose_input_methods">Choose Keyboards</string>
     <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
     <string name="current_input_method">Current Keyboard</string>
     <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index b60dc5e3d6c..46072bf6aaf 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -46,12 +46,6 @@
             android:title="@string/keyboard_settings_category"
             settings:keywords="@string/keywords_keyboard_and_ime">
 
-        <!-- An intent for this preference will be populated programmatically. -->
-        <PreferenceScreen
-                android:key="choose_input_methods"
-                android:title="@string/choose_input_methods"
-                />
-
         <PreferenceScreen
                 android:key="current_input_method"
                 android:title="@string/current_input_method"
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 3528c56a34b..f18694c562b 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -80,7 +80,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         InputMethodPreference.OnSavePreferenceListener {
     private static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
     private static final String KEY_PHONE_LANGUAGE = "phone_language";
-    private static final String KEY_CHOOSE_INPUT_METHODS = "choose_input_methods";
     private static final String KEY_CURRENT_INPUT_METHOD = "current_input_method";
     private static final String KEY_INPUT_METHOD_SELECTOR = "input_method_selector";
     private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
@@ -154,14 +153,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
             }
             mKeyboardSettingsCategory.removeAll();
             getPreferenceScreen().addPreference(mKeyboardSettingsCategory);
-        } else {
-            final Preference pref = findPreference(KEY_CHOOSE_INPUT_METHODS);
-            final Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS);
-            intent.setClass(activity, SubSettings.class);
-            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, getClass().getName());
-            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID,
-                    R.string.choose_input_methods);
-            pref.setIntent(intent);
         }
 
         // Build hard keyboard and game controller preference categories.