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

am c412a41a: Merge "Remove redundant check to detect forceAscii" 

* commit 'c412a41aff301483c179288dba68e5da0d990ee6':
  Remove redundant check to detect forceAscii
main
Tadashi G. Takaoka 2014-03-28 09:21:22 +00:00 committed by Android Git Automerger
parent 748e8339d9 c412a41aff
commit 806552c11a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

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

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

@ -93,7 +93,10 @@ public final class SubtypeSwitcher {
private int mEnabledSubtypeCount; private int mEnabledSubtypeCount;
private boolean mIsSystemLanguageSameAsInputLanguage; private boolean mIsSystemLanguageSameAsInputLanguage;
public boolean getValue() { public boolean needsToDisplayLanguage(final InputMethodSubtype subtype) {
if (SubtypeLocaleUtils.isNoLanguage(subtype)) {
return true;
}
return mEnabledSubtypeCount >= 2 || !mIsSystemLanguageSameAsInputLanguage; return mEnabledSubtypeCount >= 2 || !mIsSystemLanguageSameAsInputLanguage;
} }
@ -265,14 +268,8 @@ public final class SubtypeSwitcher {
// Subtype Switching functions // // Subtype Switching functions //
////////////////////////////////// //////////////////////////////////
public boolean needsToDisplayLanguage(final Locale keyboardLocale) { public boolean needsToDisplayLanguage(final InputMethodSubtype subtype) {
if (keyboardLocale.toString().equals(SubtypeLocaleUtils.NO_LANGUAGE)) { return mNeedsToDisplayLanguage.needsToDisplayLanguage(subtype);
return true;
}
if (!keyboardLocale.equals(getCurrentSubtypeLocale())) {
return false;
}
return mNeedsToDisplayLanguage.getValue();
} }
public boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes() { public boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypesOfEnabledImes() {