Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev am: b6cd42a

am: b279889

* commit 'b279889b29a02ac06ee699d7947b15451b71e621':
  Force a relayout when task is resized while not drag resizing.

Change-Id: I0771f8b5a4e841330dec79b0d36fb026c96adafe

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

@@ -9161,7 +9161,8 @@ public class WindowManagerService extends IWindowManager.Stub
                             + " " + w.mOutsets.toShortString()
                             + " surfaceResized=" + winAnimator.mSurfaceResized
                             + " configChanged=" + configChanged
-                            + " dragResizingChanged=" + dragResizingChanged);
+                            + " dragResizingChanged=" + dragResizingChanged
+                            + " resizedWhileNotDragResizing=" + w.mResizedWhileNotDragResizing);
                 }
 
                 // If it's a dead window left on screen, and the configuration changed,

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

@@ -2266,9 +2266,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
     private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets,
             Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,
             Configuration newConfig) throws RemoteException {
+        final boolean forceRelayout = isDragResizeChanged() || mResizedWhileNotDragResizing;
+
         mClient.resized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets,
                 reportDraw, newConfig, getBackdropFrame(frame),
-                isDragResizeChanged() /* forceRelayout */, mPolicy.isNavBarForcedShownLw(this));
+                forceRelayout, mPolicy.isNavBarForcedShownLw(this));
         mDragResizingChangeReported = true;
     }