commit 7c101a40da11d4c829a7b69dcd9f097e4afdc39c
author Yohei Yukawa <yukawa@google.com> Wed Mar 30 05:47:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 05:47:41 2016 +0000
tree f8d664ac1f37842b8ca6fb4be6adbfba29520fb6
parent e1f9e5152a9422ae9ef65d4d159ed79f383fc87f
parent 8939838d5d3ee8324d156ce60af4c7feacbb22a2

Merge "IME switcher should not always require IME_VISIBLE." into nyc-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 e042483..77b3111 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -1715,8 +1715,9 @@
             // exists in the IME switcher dialog.  Might be OK to remove this condition once
             // SHOW_IME_WITH_HARD_KEYBOARD settings finds a good place to live.
             return true;
+        } else if ((visibility & InputMethodService.IME_VISIBLE) == 0) {
+            return false;
         }
-        if ((visibility & InputMethodService.IME_VISIBLE) == 0) return false;
 
         List<InputMethodInfo> imis = mSettings.getEnabledInputMethodListLocked();
         final int N = imis.size();