am ddd69ec4: am 05f5734c: am a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev

* commit 'ddd69ec46625b275c9a096f5da9e1b8abccb2038':
  Fix Settings behavior when disabling current IME
This commit is contained in:
Tadashi G. Takaoka
2014-07-21 18:22:21 +00:00
committed by Android Git Automerger

View File

@@ -149,7 +149,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
// Filter out irrelevant features if invoked from IME settings button.
mShowsOnlyFullImeAndKeyboardList = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
activity.getIntent().getAction());
activity.getIntent().setAction(null);
if (mShowsOnlyFullImeAndKeyboardList) {
getPreferenceScreen().removeAll();
getPreferenceScreen().addPreference(mHardKeyboardCategory);