commit dbd60cd6eeb2d7f4e3ca124bedc1fd2ba7ecb4b0
author Yohei Yukawa <yukawa@google.com> Tue Aug 01 06:01:20 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 01 06:01:20 2017 +0000
tree d5791be3a6c336305b0463184f33d103c565d58d
parent 1831989a6e3ccf3610c53585d530383ea6debc7d
parent d2bc309f0680c72731cf79f1abb300daebf1ec92

Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev

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

diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index bff39b3..192fa3a 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -2088,7 +2088,8 @@
     private boolean shouldShowImeSwitcherLocked(int visibility) {
         if (!mShowOngoingImeSwitcherForPhones) return false;
         if (mSwitchingDialog != null) return false;
-        if (isScreenLocked()) return false;
+        if (mWindowManagerInternal.isKeyguardShowingAndNotOccluded()
+                && mKeyguardManager != null && mKeyguardManager.isKeyguardSecure()) return false;
         if ((visibility & InputMethodService.IME_ACTIVE) == 0) return false;
         if (mWindowManagerInternal.isHardKeyboardAvailable()) {
             if (mHardKeyboardBehavior == HardKeyboardBehavior.WIRELESS_AFFORDANCE) {