commit c428dc6f019537fd2c4b55a62eff6891d7bb46e2
author satok <satok@google.com> Wed Nov 24 21:09:08 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 24 21:09:08 2010 -0800
tree 3b99b88db05362e26427a5784d1a9f0969c04d7d
parent 92c4457294b537dc8193597b3e686caef8ddded3
parent 103cc7da5f3ff9a46aa0b1dd9fcd0c7759c2d096

Merge "Call showInputMethodPicker instead of showInputMethodSubtypePicker"

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

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 @@
             } 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();