Merge "Layout the window to be displayed if it would be resized"

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

@@ -3127,6 +3127,10 @@ public class WindowManagerService extends IWindowManager.Stub
                 }
                 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();
                     }