PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yohei Yukawa
2015-05-07 23:20:26 +00:00
committed by Android (Google) Code Review
parent 99245d13e9 e792729b4c
commit 6a03d11328
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/CryptKeeper.java
View File

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

2
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

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

2
src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
View File

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