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

Commit f09993ca authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 1a546dca: Merge "Fixed the problem ime invisible status despite being the... 

am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."

* commit '1a546dca':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
parents 253bc750 1a546dca

core/java/android/inputmethodservice/InputMethodService.java

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class InputMethodService extends AbstractInputMethodService { 
                }

            }

            // If user uses hard keyboard, IME button should always be shown.

            boolean showing = onEvaluateInputViewShown();

            boolean showing = isInputViewShown();

            mImm.setImeWindowStatus(mToken, IME_ACTIVE | (showing ? IME_VISIBLE : 0),

                    mBackDisposition);

            if (resultReceiver != null) {

services/java/com/android/server/InputMethodManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                if (mStatusBar != null) {

                    mStatusBar.setImeWindowStatus(token, vis, backDisposition);

                }

                final boolean iconVisibility = (vis & InputMethodService.IME_ACTIVE) != 0;

                final boolean iconVisibility = ((vis & (InputMethodService.IME_ACTIVE)) != 0)

                        && (mWindowManagerService.isHardKeyboardAvailable()

                                || (vis & (InputMethodService.IME_VISIBLE)) != 0);

                final InputMethodInfo imi = mMethodMap.get(mCurMethodId);

                if (imi != null && iconVisibility && needsToShowImeSwitchOngoingNotification()) {

                    // Used to load label