Merge "Minimize the number of default enabled IMEs part 1" into lmp-dev (c0b8cb89) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/inputmethod/InputMethodUtils.java

+21 −26

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ public class InputMethodUtils {
		return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage(), SUBTYPE_MODE_KEYBOARD);
		}

		private static boolean isSystemAuxilialyImeThatHashAutomaticSubtype(InputMethodInfo imi) {
		private static boolean isSystemAuxilialyImeThatHasAutomaticSubtype(InputMethodInfo imi) {
		if (!isSystemIme(imi)) {
		return false;
		}
		@@ -131,7 +131,8 @@ public class InputMethodUtils {
		boolean auxilialyImeAdded = false;
		for (int i = 0; i < imis.size(); ++i) {
		final InputMethodInfo imi = imis.get(i);
		if (isDefaultEnabledIme(isSystemReady, imi, context)) {
		if (isValidSystemDefaultIme(isSystemReady, imi, context)
		\|\| isSystemImeThatHasEnglishKeyboardSubtype(imi)) {
		retval.add(imi);
		if (imi.isAuxiliaryIme()) {
		auxilialyImeAdded = true;
		@@ -143,7 +144,7 @@ public class InputMethodUtils {
		}
		for (int i = 0; i < imis.size(); ++i) {
		final InputMethodInfo imi = imis.get(i);
		if (isSystemAuxilialyImeThatHashAutomaticSubtype(imi)) {
		if (isSystemAuxilialyImeThatHasAutomaticSubtype(imi)) {
		retval.add(imi);
		}
		}
		@@ -175,12 +176,6 @@ public class InputMethodUtils {
		return false;
		}

		public static boolean isDefaultEnabledIme(
		boolean isSystemReady, InputMethodInfo imi, Context context) {
		return isValidSystemDefaultIme(isSystemReady, imi, context)
		\|\| isSystemImeThatHasEnglishKeyboardSubtype(imi);
		}

		public static boolean containsSubtypeOf(InputMethodInfo imi, String language, String mode) {
		final int N = imi.getSubtypeCount();
		for (int i = 0; i < N; ++i) {
		@@ -219,7 +214,9 @@ public class InputMethodUtils {

		public static InputMethodInfo getMostApplicableDefaultIME(
		List<InputMethodInfo> enabledImes) {
		if (enabledImes != null && enabledImes.size() > 0) {
		if (enabledImes == null \|\| enabledImes.isEmpty()) {
		return null;
		}
		// We'd prefer to fall back on a system IME, since that is safer.
		int i = enabledImes.size();
		int firstFoundSystemIme = -1;
		@@ -237,8 +234,6 @@ public class InputMethodUtils {
		}
		return enabledImes.get(Math.max(firstFoundSystemIme, 0));
		}
		return null;
		}

		public static boolean isValidSubtypeId(InputMethodInfo imi, int subtypeHashCode) {
		return getSubtypeIdFromHashCode(imi, subtypeHashCode) != NOT_A_SUBTYPE_ID;