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

Commit 4dfbeb03 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: ed7e57b8

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



Change-Id: I4557200f5d729f7222d311dbb383e8d4d3c3561c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9dc51ea6 ed7e57b8

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();