Merge "Update shortcut IME info before checking availability of it"
This commit is contained in:
commit
e91559a119
1 changed files with 6 additions and 2 deletions
|
@ -226,6 +226,7 @@ public final class SubtypeSwitcher {
|
|||
}
|
||||
|
||||
public boolean isShortcutImeEnabled() {
|
||||
updateShortcutIME();
|
||||
if (mShortcutInputMethodInfo == null) {
|
||||
return false;
|
||||
}
|
||||
|
@ -237,10 +238,13 @@ public final class SubtypeSwitcher {
|
|||
}
|
||||
|
||||
public boolean isShortcutImeReady() {
|
||||
if (mShortcutInputMethodInfo == null)
|
||||
updateShortcutIME();
|
||||
if (mShortcutInputMethodInfo == null) {
|
||||
return false;
|
||||
if (mShortcutSubtype == null)
|
||||
}
|
||||
if (mShortcutSubtype == null) {
|
||||
return true;
|
||||
}
|
||||
if (mShortcutSubtype.containsExtraValueKey(REQ_NETWORK_CONNECTIVITY)) {
|
||||
return mIsNetworkConnected;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue