Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e91559a1 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Update shortcut IME info before checking availability of it"

parents e9584a16 b7c531b7

java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

+6 −2
Original line number Diff line number Diff line
@@ -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;

        }