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

* commit 'a229125980f12c9debb1c5a827bb96c5620b5705':
  Fix Settings behavior when disabling current IME
This commit is contained in:
Tadashi G. Takaoka
2014-07-20 01:04:33 +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);