Revert "[ML1] Introduce RichInputMethodSubtype" (a63d0a8e) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ public final class MainKeyboardAccessibilityDelegate
		*/
		private void announceKeyboardLanguage(final Keyboard keyboard) {
		final String languageText = SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(
		keyboard.mId.mSubtype.getRawSubtype());
		keyboard.mId.mSubtype);
		sendWindowStateChanged(languageText);
		}

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.os.Build;
		import android.view.inputmethod.InputMethodSubtype;

		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.latin.RichInputMethodSubtype;
		import com.android.inputmethod.latin.Constants;

		import java.lang.reflect.Constructor;
		import java.lang.reflect.Method;
		@@ -64,12 +64,9 @@ public final class InputMethodSubtypeCompatUtils {
		overridesImplicitlyEnabledSubtype, id);
		}

		public static boolean isAsciiCapable(final RichInputMethodSubtype subtype) {
		return isAsciiCapable(subtype.getRawSubtype());
		}

		public static boolean isAsciiCapable(final InputMethodSubtype subtype) {
		return InputMethodSubtypeCompatUtils.isAsciiCapableWithAPI(subtype);
		return isAsciiCapableWithAPI(subtype)
		\|\| subtype.containsExtraValueKey(Constants.Subtype.ExtraValue.ASCII_CAPABLE);
		}

		@UsedForTesting

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.KEYBOAR
		import android.text.InputType;
		import android.text.TextUtils;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputMethodSubtype;

		import com.android.inputmethod.compat.EditorInfoCompatUtils;
		import com.android.inputmethod.latin.RichInputMethodSubtype;
		import com.android.inputmethod.latin.utils.InputTypeUtils;
		import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;

		@@ -62,7 +62,7 @@ public final class KeyboardId {
		public static final int ELEMENT_EMOJI_CATEGORY5 = 15;
		public static final int ELEMENT_EMOJI_CATEGORY6 = 16;

		public final RichInputMethodSubtype mSubtype;
		public final InputMethodSubtype mSubtype;
		public final Locale mLocale;
		public final int mWidth;
		public final int mHeight;

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.util.Log;
		import android.util.SparseArray;
		import android.util.Xml;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputMethodSubtype;

		import com.android.inputmethod.compat.EditorInfoCompatUtils;
		import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
		@@ -36,7 +37,6 @@ import com.android.inputmethod.keyboard.internal.KeyboardParams;
		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;
		@@ -109,7 +109,7 @@ public final class KeyboardLayoutSet {
		boolean mVoiceInputKeyEnabled;
		boolean mNoSettingsKey;
		boolean mLanguageSwitchKeyEnabled;
		RichInputMethodSubtype mSubtype;
		InputMethodSubtype mSubtype;
		boolean mIsSpellChecker;
		int mKeyboardWidth;
		int mKeyboardHeight;
		@@ -245,7 +245,7 @@ public final class KeyboardLayoutSet {
		return this;
		}

		public Builder setSubtype(final RichInputMethodSubtype subtype) {
		public Builder setSubtype(final InputMethodSubtype subtype) {
		final boolean asciiCapable = InputMethodSubtypeCompatUtils.isAsciiCapable(subtype);
		// TODO: Consolidate with {@link InputAttributes}.
		@SuppressWarnings("deprecation")
		@@ -254,7 +254,7 @@ public final class KeyboardLayoutSet {
		final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(
		mParams.mEditorInfo.imeOptions)
		\|\| deprecatedForceAscii;
		final RichInputMethodSubtype keyboardSubtype = (forceAscii && !asciiCapable)
		final InputMethodSubtype keyboardSubtype = (forceAscii && !asciiCapable)
		? SubtypeSwitcher.getInstance().getNoLanguageSubtype()
		: subtype;
		mParams.mSubtype = keyboardSubtype;

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.view.LayoutInflater;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.inputmethod.InputMethodSubtype;

		import com.android.inputmethod.accessibility.AccessibilityUtils;
		import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
		@@ -53,10 +54,10 @@ import com.android.inputmethod.keyboard.internal.SlidingKeyInputDrawingPreview;
		import com.android.inputmethod.keyboard.internal.TimerHandler;
		import com.android.inputmethod.latin.Constants;
		import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.RichInputMethodSubtype;
		import com.android.inputmethod.latin.SuggestedWords;
		import com.android.inputmethod.latin.settings.DebugSettings;
		import com.android.inputmethod.latin.utils.CoordinateUtils;
		import com.android.inputmethod.latin.utils.SpacebarLanguageUtils;
		import com.android.inputmethod.latin.utils.TypefaceUtils;

		import java.util.WeakHashMap;
		@@ -848,16 +849,16 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack

		// Layout language name on spacebar.
		private String layoutLanguageOnSpacebar(final Paint paint,
		final RichInputMethodSubtype subtype, final int width) {
		final InputMethodSubtype subtype, final int width) {
		// Choose appropriate language name to fit into the width.
		if (mLanguageOnSpacebarFormatType == LanguageOnSpacebarHelper.FORMAT_TYPE_FULL_LOCALE) {
		final String fullText = subtype.getFullDisplayName();
		final String fullText = SpacebarLanguageUtils.getFullDisplayName(subtype);
		if (fitsTextIntoWidth(width, fullText, paint)) {
		return fullText;
		}
		}

		final String middleText = subtype.getMiddleDisplayName();
		final String middleText = SpacebarLanguageUtils.getMiddleDisplayName(subtype);
		if (fitsTextIntoWidth(width, middleText, paint)) {
		return middleText;
		}
		@@ -871,7 +872,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
		paint.setTextAlign(Align.CENTER);
		paint.setTypeface(Typeface.DEFAULT);
		paint.setTextSize(mLanguageOnSpacebarTextSize);
		final RichInputMethodSubtype subtype = getKeyboard().mId.mSubtype;
		final InputMethodSubtype subtype = getKeyboard().mId.mSubtype;
		final String language = layoutLanguageOnSpacebar(paint, subtype, width);
		// Draw language text with shadow
		final float descent = paint.descent();