commit 264254b273ca718fdf5d0aedf8461dd859c7fdad
author Conley Owens <cco3@android.com> Wed Apr 27 14:53:26 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 27 14:53:26 2011 -0700
tree 3356c92e0fb2ff554286de1c6a83800fb6e8b17a
parent 5e3562a5a51789ca179895c960827af5a8f0c96d
parent a6590e7fee1ef4286f0896358593fdb9aab24f6c

am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"

* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
  Auto hide virtual keyboard

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 667b544..26cf55f 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -929,6 +929,10 @@
                         && w.mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
                         && i > 0) {
                     WindowState wb = localmWindows.get(i-1);
+                    while (i > 1 && wb.mAppToken == w.mAppToken && !canBeImeTarget(wb)) {
+                        i--;
+                        wb = localmWindows.get(i-1);
+                    }
                     if (wb.mAppToken == w.mAppToken && canBeImeTarget(wb)) {
                         i--;
                         w = wb;