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

Merge "Move getLastInputMethodSubtype() logic to InputMethodSettings"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-25 06:29:07 +00:00
committed by Android (Google) Code Review
parent b43bfadb30 f3609800ae
commit 461369d570
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4167,23 +4167,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
if (!calledFromValidUserLocked()) {
return null;
}
final Pair<String, String> lastIme = mSettings.getLastInputMethodAndSubtypeLocked();
// TODO: Handle the case of the last IME with no subtypes
if (lastIme == null || TextUtils.isEmpty(lastIme.first)
|| TextUtils.isEmpty(lastIme.second)) return null;
final InputMethodInfo lastImi = mMethodMap.get(lastIme.first);
if (lastImi == null) return null;
try {
final int lastSubtypeHash = Integer.parseInt(lastIme.second);
final int lastSubtypeId = SubtypeUtils.getSubtypeIdFromHashCode(lastImi,
lastSubtypeHash);
if (lastSubtypeId < 0 || lastSubtypeId >= lastImi.getSubtypeCount()) {
return null;
}
return lastImi.getSubtypeAt(lastSubtypeId);
} catch (NumberFormatException e) {
return null;
}
return mSettings.getLastInputMethodSubtypeLocked();
}
}

21
services/core/java/com/android/server/inputmethod/InputMethodUtils.java
View File

@@ -592,6 +592,27 @@ final class InputMethodUtils {
return getLastSubtypeForInputMethodLockedInternal(null);
}
@Nullable
InputMethodSubtype getLastInputMethodSubtypeLocked() {
final Pair<String, String> lastIme = getLastInputMethodAndSubtypeLocked();
// TODO: Handle the case of the last IME with no subtypes
if (lastIme == null || TextUtils.isEmpty(lastIme.first)
|| TextUtils.isEmpty(lastIme.second)) return null;
final InputMethodInfo lastImi = mMethodMap.get(lastIme.first);
if (lastImi == null) return null;
try {
final int lastSubtypeHash = Integer.parseInt(lastIme.second);
final int lastSubtypeId = SubtypeUtils.getSubtypeIdFromHashCode(lastImi,
lastSubtypeHash);
if (lastSubtypeId < 0 || lastSubtypeId >= lastImi.getSubtypeCount()) {
return null;
}
return lastImi.getSubtypeAt(lastSubtypeId);
} catch (NumberFormatException e) {
return null;
}
}
String getLastSubtypeForInputMethodLocked(String imeId) {
Pair<String, String> ime = getLastSubtypeForInputMethodLockedInternal(imeId);
if (ime != null) {