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

Commit ed7e57b8 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Reset the window drawn state if drag resizing changed" into... 

Merge "Merge "Reset the window drawn state if drag resizing changed" into udc-qpr-dev am: fd11b846" into udc-qpr-dev-plus-aosp
parents 51366e74 4e1bcfeb

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1445,6 +1445,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            Slog.v(TAG_WM, "Win " + this + " config changed: " + getConfiguration());

            Slog.v(TAG_WM, "Win " + this + " config changed: " + getConfiguration());

        }

        }





        final boolean dragResizingChanged = !mDragResizingChangeReported && isDragResizeChanged();



        final boolean attachedFrameChanged = LOCAL_LAYOUT

        final boolean attachedFrameChanged = LOCAL_LAYOUT

                && mLayoutAttached && getParentWindow().frameChanged();

                && mLayoutAttached && getParentWindow().frameChanged();
@@ -1458,6 +1460,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (didFrameInsetsChange

        if (didFrameInsetsChange

                || configChanged

                || configChanged

                || insetsChanged

                || insetsChanged

                || dragResizingChanged

                || shouldSendRedrawForSync()

                || shouldSendRedrawForSync()

                || attachedFrameChanged) {

                || attachedFrameChanged) {

            ProtoLog.v(WM_DEBUG_RESIZE,

            ProtoLog.v(WM_DEBUG_RESIZE,
@@ -1478,7 +1481,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 




            // Reset the drawn state if the window need to redraw for the change, so the transition

            // Reset the drawn state if the window need to redraw for the change, so the transition

            // can wait until it has finished drawing to start.

            // can wait until it has finished drawing to start.

            if ((configChanged || getOrientationChanging()) && isVisibleRequested()) {

            if ((configChanged || getOrientationChanging() || dragResizingChanged)

                    && isVisibleRequested()) {

                winAnimator.mDrawState = DRAW_PENDING;

                winAnimator.mDrawState = DRAW_PENDING;

                if (mActivityRecord != null) {

                if (mActivityRecord != null) {

                    mActivityRecord.clearAllDrawn();

                    mActivityRecord.clearAllDrawn();