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

Commit 11187280 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Crop windowing layer to that of display size in screen... 

Merge "Revert "Revert "Crop windowing layer to that of display size in screen rotation animation""" into tm-qpr-dev am: 8426faea am: 6e8a0971

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



Change-Id: I54b6bbad07c57ef2d7396c154c6b6ff691abc4f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eaf9d507 6e8a0971

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

+8 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ class ScreenRotationAnimation { 
        }



        private SurfaceAnimator startDisplayRotation() {

            return startAnimation(initializeBuilder()

            SurfaceAnimator animator = startAnimation(initializeBuilder()

                            .setAnimationLeashParent(mDisplayContent.getSurfaceControl())

                            .setSurfaceControl(mDisplayContent.getWindowingLayer())

                            .setParentSurfaceControl(mDisplayContent.getSurfaceControl())
@@ -604,6 +604,13 @@ class ScreenRotationAnimation { 
                            .build(),

                    createWindowAnimationSpec(mRotateEnterAnimation),

                    this::onAnimationEnd);



            // Crop the animation leash to avoid extended wallpaper from showing over

            // mBackColorSurface

            Rect displayBounds = mDisplayContent.getBounds();

            mDisplayContent.getPendingTransaction()

                    .setWindowCrop(animator.mLeash, displayBounds.width(), displayBounds.height());

            return animator;

        }



        private SurfaceAnimator startScreenshotAlphaAnimation() {