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

Commit 4e1bcfeb authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Reset the window drawn state if drag resizing changed" into udc-qpr-dev am: fd11b846 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23505522



Change-Id: Ie0f26a4e4e7d4afbcc23f4261475c3861830d3a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ac77122 fd11b846

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

+5 −1
Original line number 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());

        }



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



        final boolean attachedFrameChanged = LOCAL_LAYOUT

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

                || configChanged

                || insetsChanged

                || dragResizingChanged

                || shouldSendRedrawForSync()

                || attachedFrameChanged) {

            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

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

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

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

                    && isVisibleRequested()) {

                winAnimator.mDrawState = DRAW_PENDING;

                if (mActivityRecord != null) {

                    mActivityRecord.clearAllDrawn();