Merge "Auto hide virtual keyboard"

2011-04-27 13:20:16 -07:00
parent a538b4a206 44ad61c3a5
commit 13b21e608e
1 changed files with 4 additions and 0 deletions
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -929,6 +929,10 @@ public class WindowManagerService extends IWindowManager.Stub
                        && 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;