Merge "Fix Settings behavior when disabling current IME" into lmp-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a229125980
@@ -149,7 +149,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
|
|||||||
// Filter out irrelevant features if invoked from IME settings button.
|
// Filter out irrelevant features if invoked from IME settings button.
|
||||||
mShowsOnlyFullImeAndKeyboardList = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
|
mShowsOnlyFullImeAndKeyboardList = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
|
||||||
activity.getIntent().getAction());
|
activity.getIntent().getAction());
|
||||||
activity.getIntent().setAction(null);
|
|
||||||
if (mShowsOnlyFullImeAndKeyboardList) {
|
if (mShowsOnlyFullImeAndKeyboardList) {
|
||||||
getPreferenceScreen().removeAll();
|
getPreferenceScreen().removeAll();
|
||||||
getPreferenceScreen().addPreference(mHardKeyboardCategory);
|
getPreferenceScreen().addPreference(mHardKeyboardCategory);
|
||||||
|
Reference in New Issue
Block a user