Merge "Move some methods out from SubtypeSwitcher" (6e61cd3b) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ import com.android.inputmethod.latin.common.Constants;
		import java.lang.reflect.Constructor;
		import java.lang.reflect.Method;

		import javax.annotation.Nonnull;

		public final class InputMethodSubtypeCompatUtils {
		private static final String TAG = InputMethodSubtypeCompatUtils.class.getSimpleName();
		// Note that InputMethodSubtype(int nameId, int iconId, String locale, String mode,
		@@ -53,6 +55,7 @@ public final class InputMethodSubtypeCompatUtils {
		}

		@SuppressWarnings("deprecation")
		@Nonnull
		public static InputMethodSubtype newInputMethodSubtype(int nameId, int iconId, String locale,
		String mode, String extraValue, boolean isAuxiliary,
		boolean overridesImplicitlyEnabledSubtype, int id) {

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.inputmethod.keyboard.internal.KeysCache;
		import com.android.inputmethod.latin.InputAttributes;
		import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.RichInputMethodSubtype;
		import com.android.inputmethod.latin.SubtypeSwitcher;
		import com.android.inputmethod.latin.define.DebugFlags;
		import com.android.inputmethod.latin.utils.InputTypeUtils;
		import com.android.inputmethod.latin.utils.ScriptUtils;
		@@ -276,7 +275,7 @@ public final class KeyboardLayoutSet {
		mParams.mEditorInfo.imeOptions)
		\|\| deprecatedForceAscii;
		final RichInputMethodSubtype keyboardSubtype = (forceAscii && !asciiCapable)
		? SubtypeSwitcher.getInstance().getNoLanguageSubtype()
		? RichInputMethodSubtype.getNoLanguageSubtype()
		: subtype;
		mParams.mSubtype = keyboardSubtype;
		mParams.mKeyboardLayoutSetName = KEYBOARD_LAYOUT_SET_RESOURCE_PREFIX

java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import com.android.inputmethod.keyboard.internal.KeyVisualAttributes;
		import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
		import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
		import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.SubtypeSwitcher;
		import com.android.inputmethod.latin.RichInputMethodSubtype;
		import com.android.inputmethod.latin.common.Constants;
		import com.android.inputmethod.latin.utils.ResourceUtils;

		@@ -113,7 +113,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
		context, null /* editorInfo */);
		final Resources res = context.getResources();
		mEmojiLayoutParams = new EmojiLayoutParams(res);
		builder.setSubtype(SubtypeSwitcher.getInstance().getEmojiSubtype());
		builder.setSubtype(RichInputMethodSubtype.getEmojiSubtype());
		builder.setKeyboardGeometry(ResourceUtils.getDefaultKeyboardWidth(res),
		mEmojiLayoutParams.mEmojiKeyboardHeight);
		final KeyboardLayoutSet layoutSet = builder.build();

java/src/com/android/inputmethod/latin/LatinIME.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -626,7 +626,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		private void refreshPersonalizationDictionarySession(
		final SettingsValues currentSettingsValues) {
		mDictionaryFacilitator.setIsMonolingualUser(
		mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes());
		mRichImm.isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes());
		mPersonalizationDictionaryUpdater.onLoadSettings(
		currentSettingsValues.mUsePersonalizedDicts);
		mContextualDictionaryUpdater.onLoadSettings(currentSettingsValues.mUsePersonalizedDicts);
		@@ -863,7 +863,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		// also wouldn't be consuming gesture data.
		mGestureConsumer = GestureConsumer.NULL_GESTURE_CONSUMER;
		mRichImm.clearSubtypeCaches();
		mSubtypeSwitcher.refreshSubtypeInfo();
		mSubtypeSwitcher.onSubtypeChanged(mRichImm.getCurrentRawSubtype());
		final KeyboardSwitcher switcher = mKeyboardSwitcher;
		switcher.updateKeyboardTheme();
		final MainKeyboardView mainKeyboardView = switcher.getMainKeyboardView();

java/src/com/android/inputmethod/latin/RichInputMethodManager.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ import android.view.inputmethod.InputMethodManager;
		import android.view.inputmethod.InputMethodSubtype;

		import com.android.inputmethod.compat.InputMethodManagerCompatWrapper;
		import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
		import com.android.inputmethod.latin.common.Constants;
		import com.android.inputmethod.latin.settings.AdditionalFeaturesSettingUtils;
		import com.android.inputmethod.latin.settings.Settings;
		import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
		@@ -36,7 +38,10 @@ import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;

		import java.util.Collections;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.Set;

		import javax.annotation.Nonnull;

		@@ -432,4 +437,29 @@ public class RichInputMethodManager {
		}
		return mImmWrapper.shouldOfferSwitchingToNextInputMethod(binder);
		}

		public boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes() {
		final Locale systemLocale = mContext.getResources().getConfiguration().locale;
		final Set<InputMethodSubtype> enabledSubtypesOfEnabledImes = new HashSet<>();
		final InputMethodManager inputMethodManager = getInputMethodManager();
		final List<InputMethodInfo> enabledInputMethodInfoList =
		inputMethodManager.getEnabledInputMethodList();
		for (final InputMethodInfo info : enabledInputMethodInfoList) {
		final List<InputMethodSubtype> enabledSubtypes =
		inputMethodManager.getEnabledInputMethodSubtypeList(
		info, true /* allowsImplicitlySelectedSubtypes */);
		if (enabledSubtypes.isEmpty()) {
		// An IME with no subtypes is found.
		return false;
		}
		enabledSubtypesOfEnabledImes.addAll(enabledSubtypes);
		}
		for (final InputMethodSubtype subtype : enabledSubtypesOfEnabledImes) {
		if (!subtype.isAuxiliary() && !subtype.getLocale().isEmpty()
		&& !systemLocale.equals(SubtypeLocaleUtils.getSubtypeLocale(subtype))) {
		return false;
		}
		}
		return true;
		}
		}