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

Commit d81db227 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Do handle MSG_RESIZED when the dragResizing flag changes" into... 

Merge "Merge "Do handle MSG_RESIZED when the dragResizing flag changes" into udc-qpr-dev am: 7f3b494b" into udc-qpr-dev-plus-aosp am: 760f60f3

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



Change-Id: Icbe51fbccd0a18d1359a5eb9c85326267ec97856
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88ffdcd9 760f60f3

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1899,9 +1899,10 @@ public final class ViewRootImpl implements ViewParent, 
                && !Objects.equals(mTmpFrames.attachedFrame, attachedFrame);

                && !Objects.equals(mTmpFrames.attachedFrame, attachedFrame);

        final boolean displayChanged = mDisplay.getDisplayId() != displayId;

        final boolean displayChanged = mDisplay.getDisplayId() != displayId;

        final boolean compatScaleChanged = mTmpFrames.compatScale != compatScale;

        final boolean compatScaleChanged = mTmpFrames.compatScale != compatScale;

        final boolean dragResizingChanged = mPendingDragResizing != dragResizing;

        if (msg == MSG_RESIZED && !frameChanged && !configChanged && !attachedFrameChanged

        if (msg == MSG_RESIZED && !frameChanged && !configChanged && !attachedFrameChanged

                && !displayChanged && !forceNextWindowRelayout

                && !displayChanged && !forceNextWindowRelayout

                && !compatScaleChanged) {

                && !compatScaleChanged && !dragResizingChanged) {

            return;

            return;

        }

        }