From e792729b4ca60632b43c9e1ee6126fb5e031deae Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Mon, 4 May 2015 17:31:00 -0700 Subject: [PATCH] Making the behavior deterministic when the IME picker is shown. In the language & input settings, the auxiliary IME subtypes have been hidden since they should not be a default. With Id156c85535a22, now we can explicitly control the behavior of input method picker. Note the this CL should not change any user visible behaviors. Bug: 20763994 Change-Id: I9f797d07ba02363fab58ceb9aecb3cc11fbc407e --- src/com/android/settings/CryptKeeper.java | 2 +- .../settings/inputmethod/InputMethodAndLanguageSettings.java | 2 +- .../android/settings/inputmethod/InputMethodDialogReceiver.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 7005ece4245..653a7816a7b 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/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 */); } }); } diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 1b2f5679a93..8f23ce93c09 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/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; diff --git a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java index 46be132074b..e442e883b80 100644 --- a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java +++ b/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 */); } } }