nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am ad4216be: Use InputMethodSubtypeCompatUtils to create subtypes 

* commit 'ad4216becd0db8e47246e656e33f875534520f19':
  Use InputMethodSubtypeCompatUtils to create subtypes
main
Tadashi G. Takaoka 2013-11-25 22:46:43 -08:00 committed by Android Git Automerger
parent 0eaddcaba7 ad4216becd
commit fe6423076e
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
View File

@ -32,6 +32,7 @@ import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype;
import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
import com.android.inputmethod.keyboard.KeyboardSwitcher; import com.android.inputmethod.keyboard.KeyboardSwitcher;
import com.android.inputmethod.latin.utils.LocaleUtils; import com.android.inputmethod.latin.utils.LocaleUtils;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
@ -57,23 +58,34 @@ public final class SubtypeSwitcher {
private InputMethodSubtype mEmojiSubtype; private InputMethodSubtype mEmojiSubtype;
private boolean mIsNetworkConnected; private boolean mIsNetworkConnected;
private static final String KEYBOARD_MODE = "keyboard";
// Dummy no language QWERTY subtype. See {@link R.xml.method}. // Dummy no language QWERTY subtype. See {@link R.xml.method}.
private static final InputMethodSubtype DUMMY_NO_LANGUAGE_SUBTYPE = new InputMethodSubtype( private static final int SUBTYPE_ID_OF_DUMMY_NO_LANGUAGE_SUBTYPE = 0xdde0bfd3;
R.string.subtype_no_language_qwerty, R.drawable.ic_ime_switcher_dark, private static final String EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE =
SubtypeLocaleUtils.NO_LANGUAGE, "keyboard", "KeyboardLayoutSet=" "KeyboardLayoutSet=" + SubtypeLocaleUtils.QWERTY
+ SubtypeLocaleUtils.QWERTY + "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE
+ "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE + "," + Constants.Subtype.ExtraValue.ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE
+ "," + Constants.Subtype.ExtraValue.ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE + "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
+ "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE, private static final InputMethodSubtype DUMMY_NO_LANGUAGE_SUBTYPE =
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */); InputMethodSubtypeCompatUtils.newInputMethodSubtype(
R.string.subtype_no_language_qwerty, R.drawable.ic_ime_switcher_dark,
SubtypeLocaleUtils.NO_LANGUAGE, KEYBOARD_MODE,
EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE,
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */,
SUBTYPE_ID_OF_DUMMY_NO_LANGUAGE_SUBTYPE);
// Caveat: We probably should remove this when we add an Emoji subtype in {@link R.xml.method}. // Caveat: We probably should remove this when we add an Emoji subtype in {@link R.xml.method}.
// Dummy Emoji subtype. See {@link R.xml.method}. // Dummy Emoji subtype. See {@link R.xml.method}.
private static final InputMethodSubtype DUMMY_EMOJI_SUBTYPE = new InputMethodSubtype( private static final int SUBTYPE_ID_OF_DUMMY_EMOJI_SUBTYPE = 0xd78b2ed0;
R.string.subtype_emoji, R.drawable.ic_ime_switcher_dark, private static final String EXTRA_VALUE_OF_DUMMY_EMOJI_SUBTYPE =
SubtypeLocaleUtils.NO_LANGUAGE, "keyboard", "KeyboardLayoutSet=" "KeyboardLayoutSet=" + SubtypeLocaleUtils.EMOJI
+ SubtypeLocaleUtils.EMOJI + "," + "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
+ Constants.Subtype.ExtraValue.EMOJI_CAPABLE, private static final InputMethodSubtype DUMMY_EMOJI_SUBTYPE =
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */); InputMethodSubtypeCompatUtils.newInputMethodSubtype(
R.string.subtype_emoji, R.drawable.ic_ime_switcher_dark,
SubtypeLocaleUtils.NO_LANGUAGE, KEYBOARD_MODE,
EXTRA_VALUE_OF_DUMMY_EMOJI_SUBTYPE,
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */,
SUBTYPE_ID_OF_DUMMY_EMOJI_SUBTYPE);
static final class NeedsToDisplayLanguage { static final class NeedsToDisplayLanguage {
private int mEnabledSubtypeCount; private int mEnabledSubtypeCount;