commit d719fe1f5c8badd00f7e8ef57d0209c31f0fbcea
author Tadashi G. Takaoka <takaoka@google.com> Fri Jul 08 19:26:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 08 19:26:50 2011 -0700
tree bc83c8e30f4c6aca641d81812ca7c39b7cecba50
parent 6ec10e53a413ca240a54b8ca41f3c9bee4bc5585
parent 2321caa1f9eb6c2d616bc36f11f5b48eebf144fe

Merge "Narrower key timer handler static inner class to TimerProxy interface"

java/res/xml/prefs.xml

diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 734c6dc..0bf117b 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -18,12 +18,12 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/english_ime_settings"
     android:key="english_ime_settings">
-    <PreferenceScreen
-        android:key="subtype_settings"
-        android:title="@string/language_selection_title" />
     <PreferenceCategory
         android:title="@string/general_category"
         android:key="general_settings">
+        <PreferenceScreen
+            android:key="subtype_settings"
+            android:title="@string/language_selection_title" />
         <CheckBoxPreference
             android:key="auto_cap"
             android:title="@string/auto_cap"

java/src/com/android/inputmethod/latin/Settings.java

diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index fe6114b..1851973 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -18,6 +18,7 @@
 
 import com.android.inputmethod.compat.CompatUtils;
 import com.android.inputmethod.compat.InputMethodManagerCompatWrapper;
+import com.android.inputmethod.compat.InputMethodServiceCompatWrapper;
 import com.android.inputmethod.deprecated.VoiceProxy;
 import com.android.inputmethod.compat.VibratorCompatWrapper;
 
@@ -289,7 +290,6 @@
     }
 
     private PreferenceScreen mInputLanguageSelection;
-    private CheckBoxPreference mQuickFixes;
     private ListPreference mVoicePreference;
     private ListPreference mSettingsKeyPreference;
     private ListPreference mShowCorrectionSuggestionsPreference;
@@ -337,7 +337,6 @@
         addPreferencesFromResource(R.xml.prefs);
         mInputLanguageSelection = (PreferenceScreen) findPreference(PREF_SUBTYPES);
         mInputLanguageSelection.setOnPreferenceClickListener(this);
-        mQuickFixes = (CheckBoxPreference) findPreference(PREF_QUICK_FIXES);
         mVoicePreference = (ListPreference) findPreference(PREF_VOICE_SETTINGS_KEY);
         mSettingsKeyPreference = (ListPreference) findPreference(PREF_SETTINGS_KEY);
         mShowCorrectionSuggestionsPreference =
@@ -384,6 +383,10 @@
             generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
         }
 
+        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {
+            generalSettings.removePreference(findPreference(PREF_SUBTYPES));
+        }
+
         final boolean showPopupOption = res.getBoolean(
                 R.bool.config_enable_show_popup_on_keypress_option);
         if (!showPopupOption) {