commit 3e305491cc24669305e22875c1fea337faed0b2c
author Olawale Ogunwale <ogunwale@google.com> Tue Mar 24 16:25:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 24 16:25:03 2015 +0000
tree c194eb54486f4b372ca122965282ddbe0a434826
parent fecfadb5084d89d987e4b4f0793feb8c18897a3d
parent 000293c93b41f69857f228d085b6f44b9afa34b0

am 000293c9: Merge "Layout the window to be displayed if it would be resized"

* commit '000293c93b41f69857f228d085b6f44b9afa34b0':
  Layout the window to be displayed if it would be resized

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 597de70..43663e3 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3140,6 +3140,10 @@
                 }
                 winAnimator.mEnteringAnimation = true;
                 if (toBeDisplayed) {
+                    if ((win.mAttrs.softInputMode & SOFT_INPUT_MASK_ADJUST)
+                            == SOFT_INPUT_ADJUST_RESIZE) {
+                        win.mLayoutNeeded = true;
+                    }
                     if (win.isDrawnLw() && okToDisplay()) {
                         winAnimator.applyEnterAnimationLocked();
                     }