summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-11-24 21:09:08 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-24 21:09:08 -0800
commitc428dc6f019537fd2c4b55a62eff6891d7bb46e2 (patch)
tree3b99b88db05362e26427a5784d1a9f0969c04d7d /src/com/android/settings
parent92c4457294b537dc8193597b3e686caef8ddded3 (diff)
parent103cc7da5f3ff9a46aa0b1dd9fcd0c7759c2d096 (diff)
downloadpackages_apps_settings-c428dc6f019537fd2c4b55a62eff6891d7bb46e2.zip
packages_apps_settings-c428dc6f019537fd2c4b55a62eff6891d7bb46e2.tar.gz
packages_apps_settings-c428dc6f019537fd2c4b55a62eff6891d7bb46e2.tar.bz2
Merge "Call showInputMethodPicker instead of showInputMethodSubtypePicker"
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index a13a292..22cec54 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -225,7 +225,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment {
} else if (KEY_INPUT_METHOD.equals(preference.getKey())) {
final InputMethodManager imm = (InputMethodManager)
getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.showInputMethodSubtypePicker();
+ imm.showInputMethodPicker();
} else if (preference.getIntent() == null) {
PreferenceScreen pref = (PreferenceScreen) preference;
String activityName = pref.getKey();