From b9e56cde8b75b3c773c8433efec15a6d16fbf95d Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Tue, 28 Jun 2011 21:33:17 +0900
Subject: [PATCH] Show subtype settings preference for new design
Change-Id: I6164ab6ae3d97e2095778a4a6fd9f36c508af7b0
---
java/res/xml/prefs.xml | 8 ++++----
java/src/com/android/inputmethod/latin/Settings.java | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index f68ee01689..5252c04861 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -18,6 +18,10 @@
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"
+ android:summary="@string/language_selection_summary" />
<PreferenceCategory
android:title="@string/general_category"
android:key="general_settings">
@@ -60,10 +64,6 @@
android:entryValues="@array/voice_input_modes_values"
android:entries="@array/voice_input_modes"
android:defaultValue="@string/voice_mode_main" />
- <PreferenceScreen
- android:key="subtype_settings"
- android:title="@string/language_selection_title"
- android:summary="@string/language_selection_summary" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/correction_category"
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 6c515c845d..baad66d875 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -375,10 +375,6 @@ public class Settings extends PreferenceActivity
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) {
--
GitLab