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

Commit 4244c531 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

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

Merge "Crop windowing layer to that of display size in screen rotation animation" into tm-qpr-dev am: dbc96048

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



Change-Id: I04b368538a1c6ad61fcc737aacfd643b5d7683f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06fae323 dbc96048

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

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

        }





        private SurfaceAnimator startDisplayRotation() {

        private SurfaceAnimator startDisplayRotation() {

            return startAnimation(initializeBuilder()

            SurfaceAnimator animator = startAnimation(initializeBuilder()

                            .setAnimationLeashParent(mDisplayContent.getSurfaceControl())

                            .setAnimationLeashParent(mDisplayContent.getSurfaceControl())

                            .setSurfaceControl(mDisplayContent.getWindowingLayer())

                            .setSurfaceControl(mDisplayContent.getWindowingLayer())

                            .setParentSurfaceControl(mDisplayContent.getSurfaceControl())

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

                            .build(),

                    createWindowAnimationSpec(mRotateEnterAnimation),

                    createWindowAnimationSpec(mRotateEnterAnimation),

                    this::onAnimationEnd);

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

        private SurfaceAnimator startScreenshotAlphaAnimation() {