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

am e91559a1: Merge "Update shortcut IME info before checking availability of it" 

* commit 'e91559a1197e794f3c41e442900907a680d0c91d':
  Update shortcut IME info before checking availability of it
main
Tadashi G. Takaoka 2014-01-05 19:09:35 -08:00 committed by Android Git Automerger
parent b0e81cdf77 e91559a119
commit c6f0674c6f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,6 +226,7 @@ public final class SubtypeSwitcher {
} }
public boolean isShortcutImeEnabled() { public boolean isShortcutImeEnabled() {
updateShortcutIME();
if (mShortcutInputMethodInfo == null) { if (mShortcutInputMethodInfo == null) {
return false; return false;
} }
@ -237,10 +238,13 @@ public final class SubtypeSwitcher {
} }
public boolean isShortcutImeReady() { public boolean isShortcutImeReady() {
if (mShortcutInputMethodInfo == null) updateShortcutIME();
if (mShortcutInputMethodInfo == null) {
return false; return false;
if (mShortcutSubtype == null) }
if (mShortcutSubtype == null) {
return true; return true;
}
if (mShortcutSubtype.containsExtraValueKey(REQ_NETWORK_CONNECTIVITY)) { if (mShortcutSubtype.containsExtraValueKey(REQ_NETWORK_CONNECTIVITY)) {
return mIsNetworkConnected; return mIsNetworkConnected;
} }