Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up IMMS#handleShellCommandResetInputMethod() a bit

Browse Source 
There should be no observable behavior change.

Bug: 34886274
Test: 'adb shell ime reset' still works
Change-Id: I45e2b2521b6ac2890f604745f1f2977a5a162610
This commit is contained in:
Yohei Yukawa
2018-12-27 08:40:16 -08:00
parent ab1ad60ec8
commit de5748e47d
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -4841,23 +4841,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
// Also reset the settings of the current IME
mSettings.putSelectedInputMethod(null);
// Disable all enabled IMEs.
{
final ArrayList<InputMethodInfo> enabledImes =
mSettings.getEnabledInputMethodListLocked();
final int N = enabledImes.size();
for (int i = 0; i < N; ++i) {
setInputMethodEnabledLocked(enabledImes.get(i).getId(), false);
}
}
mSettings.getEnabledInputMethodListLocked().forEach(
imi -> setInputMethodEnabledLocked(imi.getId(), false));
// Re-enable with default enabled IMEs.
{
final ArrayList<InputMethodInfo> defaultEnabledIme =
InputMethodUtils.getDefaultEnabledImes(mContext, mMethodList);
final int N = defaultEnabledIme.size();
for (int i = 0; i < N; ++i) {
setInputMethodEnabledLocked(defaultEnabledIme.get(i).getId(), true);
}
}
InputMethodUtils.getDefaultEnabledImes(mContext, mMethodList).forEach(
imi -> setInputMethodEnabledLocked(imi.getId(), true));
updateInputMethodsFromSettingsLocked(true /* enabledMayChange */);
InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,
mSettings.getEnabledInputMethodListLocked(),