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

am 48814037: Merge "Stop using deprecated InputMethodSubtype constructor" 

* commit '48814037484663faa0d2820b21baf9c3a1bf6bbf':
  Stop using deprecated InputMethodSubtype constructor
main
Yohei Yukawa 2014-02-16 22:57:49 -08:00 committed by Android Git Automerger
parent f96e9cf172 4881403748
commit 0fcc4b6d36
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/src/com/android/inputmethod/latin/InputTestsBase.java
View File

@ -35,6 +35,7 @@ import android.view.inputmethod.InputMethodSubtype;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Key;
import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
@ -290,17 +291,25 @@ public class InputTestsBase extends ServiceTestCase<LatinIMEForTests> {
protected void changeLanguageWithoutWait(final String locale) { protected void changeLanguageWithoutWait(final String locale) {
mEditText.mCurrentLocale = LocaleUtils.constructLocaleFromString(locale); mEditText.mCurrentLocale = LocaleUtils.constructLocaleFromString(locale);
final InputMethodSubtype subtype = new InputMethodSubtype( // TODO: this is forcing a QWERTY keyboard for all locales, which is wrong.
R.string.subtype_no_language_qwerty, R.drawable.ic_ime_switcher_dark, // It's still better than using whatever keyboard is the current one, but we
locale, "keyboard", "KeyboardLayoutSet=" // should actually use the default keyboard for this locale.
// TODO: this is forcing a QWERTY keyboard for all locales, which is wrong. // TODO: Use {@link InputMethodSubtype.InputMethodSubtypeBuilder} directly or indirectly so
// It's still better than using whatever keyboard is the current one, but we // that {@link InputMethodSubtype#isAsciiCapable} can return the correct value.
// should actually use the default keyboard for this locale. final String EXTRA_VALUE_FOR_TEST =
+ SubtypeLocaleUtils.QWERTY "KeyboardLayoutSet=" + 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;
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */); final InputMethodSubtype subtype = InputMethodSubtypeCompatUtils.newInputMethodSubtype(
R.string.subtype_no_language_qwerty,
R.drawable.ic_ime_switcher_dark,
locale,
Constants.Subtype.KEYBOARD_MODE,
EXTRA_VALUE_FOR_TEST,
false /* isAuxiliary */,
false /* overridesImplicitlyEnabledSubtype */,
0 /* id */);
SubtypeSwitcher.getInstance().forceSubtype(subtype); SubtypeSwitcher.getInstance().forceSubtype(subtype);
mLatinIME.loadKeyboard(); mLatinIME.loadKeyboard();
runMessages(); runMessages();