Merge "Making the behavior deterministic when the IME picker is shown." into mnc-dev

src/com/android/settings/CryptKeeper.java

@@ -765,7 +765,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             imeSwitcher.setOnClickListener(new OnClickListener() {
                     @Override
                 public void onClick(View v) {
-                    imm.showInputMethodPicker();
+                    imm.showInputMethodPicker(false /* showAuxiliarySubtypes */);
                 }
             });
         }

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

@@ -325,7 +325,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
             } else if (KEY_CURRENT_INPUT_METHOD.equals(preference.getKey())) {
                 final InputMethodManager imm = (InputMethodManager)
                         getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showInputMethodPicker();
+                imm.showInputMethodPicker(false /* showAuxiliarySubtypes */);
             }
         } else if (preference instanceof SwitchPreference) {
             final SwitchPreference pref = (SwitchPreference) preference;

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

@@ -26,7 +26,7 @@ public class InputMethodDialogReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         if (Settings.ACTION_SHOW_INPUT_METHOD_PICKER.equals(intent.getAction())) {
             ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE))
-                    .showInputMethodPicker();
+                    .showInputMethodPicker(true /* showAuxiliarySubtypes */);
         }
     }
 }