Merge "Remove redundant check to detect forceAscii" (c412a41a) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		final boolean subtypeChanged = (oldKeyboard == null)
		\|\| !keyboard.mId.mLocale.equals(oldKeyboard.mId.mLocale);
		final boolean needsToDisplayLanguage = mSubtypeSwitcher.needsToDisplayLanguage(
		keyboard.mId.mLocale);
		keyboard.mId.mSubtype);
		keyboardView.startDisplayLanguageOnSpacebar(subtypeChanged, needsToDisplayLanguage,
		RichInputMethodManager.getInstance().hasMultipleEnabledIMEsOrSubtypes(true));
		}

+6 −9

Original line number	Diff line number	Diff line
		@@ -93,7 +93,10 @@ public final class SubtypeSwitcher {
		private int mEnabledSubtypeCount;
		private boolean mIsSystemLanguageSameAsInputLanguage;

		public boolean getValue() {
		public boolean needsToDisplayLanguage(final InputMethodSubtype subtype) {
		if (SubtypeLocaleUtils.isNoLanguage(subtype)) {
		return true;
		}
		return mEnabledSubtypeCount >= 2 \|\| !mIsSystemLanguageSameAsInputLanguage;
		}

		@@ -265,14 +268,8 @@ public final class SubtypeSwitcher {
		// Subtype Switching functions //
		//////////////////////////////////

		public boolean needsToDisplayLanguage(final Locale keyboardLocale) {
		if (keyboardLocale.toString().equals(SubtypeLocaleUtils.NO_LANGUAGE)) {
		return true;
		}
		if (!keyboardLocale.equals(getCurrentSubtypeLocale())) {
		return false;
		}
		return mNeedsToDisplayLanguage.getValue();
		public boolean needsToDisplayLanguage(final InputMethodSubtype subtype) {
		return mNeedsToDisplayLanguage.needsToDisplayLanguage(subtype);
		}

		public boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes() {