Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75629e8d authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Force a relayout when task is resized while not drag resizing." into... 

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

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

Change-Id: Ic04a2ba0730483b500b02c801d7474fb2fa04145
parents 34314e83 d782bf9c

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

+2 −1
Original line number Diff line number Diff line
@@ -9167,7 +9167,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

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }