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

Commit 136a2353 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L77300030007239273:N00600030116629593"... 

Merge changes from topic "cherrypicker-L77300030007239273:N00600030116629593" into main am: aac9f819 am: 502a1175

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



Change-Id: Iaef378d22229d0f50c442ec4998f146118b9d3cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad3a02fd 502a1175

core/java/android/window/SnapshotDrawerUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -151,7 +151,9 @@ public class SnapshotDrawerUtils { 
        @VisibleForTesting

        public void setFrames(Rect frame, Rect systemBarInsets) {

            mFrame.set(frame);

            mSizeMismatch = (mFrame.width() != mSnapshotW || mFrame.height() != mSnapshotH);

            final Rect letterboxInsets = mSnapshot.getLetterboxInsets();

            mSizeMismatch = (mFrame.width() != mSnapshotW || mFrame.height() != mSnapshotH)

                    || letterboxInsets.left != 0 || letterboxInsets.top != 0;

            if (!Flags.drawSnapshotAspectRatioMatch() && systemBarInsets != null) {

                mSystemBarInsets.set(systemBarInsets);

                mSystemBarBackgroundPainter.setInsets(systemBarInsets);