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

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

Merge "Crop windowing layer for shell rotation animation" into tm-qpr-dev am: e1ea5db7 

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



Change-Id: I9a531cd7fc3df396dae523b4f84fe826fe110793
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27ede876 e1ea5db7

libs/WindowManager/Shell/src/com/android/wm/shell/transition/ScreenRotationAnimation.java

+8 −19
Original line number Original line Diff line number Diff line
@@ -86,8 +86,6 @@ class ScreenRotationAnimation { 
    private final float[] mTmpFloats = new float[9];

    private final float[] mTmpFloats = new float[9];

    /** The leash of the changing window container. */

    /** The leash of the changing window container. */

    private final SurfaceControl mSurfaceControl;

    private final SurfaceControl mSurfaceControl;

    private final Rect mStartBounds = new Rect();

    private final Rect mEndBounds = new Rect();





    private final int mAnimHint;

    private final int mAnimHint;

    private final int mStartWidth;

    private final int mStartWidth;
@@ -105,8 +103,7 @@ class ScreenRotationAnimation { 
     */

     */

    private SurfaceControl mBackColorSurface;

    private SurfaceControl mBackColorSurface;

    /** The leash using to animate screenshot layer. */

    /** The leash using to animate screenshot layer. */

    private SurfaceControl mAnimLeash;

    private final SurfaceControl mAnimLeash;

    private Transaction mTransaction;





    // The current active animation to move from the old to the new rotated

    // The current active animation to move from the old to the new rotated

    // state.  Which animation is run here will depend on the old and new

    // state.  Which animation is run here will depend on the old and new
@@ -134,9 +131,6 @@ class ScreenRotationAnimation { 
        mStartRotation = change.getStartRotation();

        mStartRotation = change.getStartRotation();

        mEndRotation = change.getEndRotation();

        mEndRotation = change.getEndRotation();





        mStartBounds.set(change.getStartAbsBounds());

        mEndBounds.set(change.getEndAbsBounds());



        mAnimLeash = new SurfaceControl.Builder(session)

        mAnimLeash = new SurfaceControl.Builder(session)

                .setParent(rootLeash)

                .setParent(rootLeash)

                .setEffectLayer()

                .setEffectLayer()
@@ -169,6 +163,8 @@ class ScreenRotationAnimation { 




            t.setLayer(mAnimLeash, SCREEN_FREEZE_LAYER_BASE);

            t.setLayer(mAnimLeash, SCREEN_FREEZE_LAYER_BASE);

            t.show(mAnimLeash);

            t.show(mAnimLeash);

            // Crop the real content in case it contains a larger child layer, e.g. wallpaper.

            t.setCrop(mSurfaceControl, new Rect(0, 0, mEndWidth, mEndHeight));





            final ColorSpace colorSpace = screenshotBuffer.getColorSpace();

            final ColorSpace colorSpace = screenshotBuffer.getColorSpace();

            final HardwareBuffer hardwareBuffer = screenshotBuffer.getHardwareBuffer();

            final HardwareBuffer hardwareBuffer = screenshotBuffer.getHardwareBuffer();
@@ -306,7 +302,6 @@ class ScreenRotationAnimation { 
        mRotateEnterAnimation.restrictDuration(MAX_ANIMATION_DURATION);

        mRotateEnterAnimation.restrictDuration(MAX_ANIMATION_DURATION);

        mRotateEnterAnimation.scaleCurrentDuration(animationScale);

        mRotateEnterAnimation.scaleCurrentDuration(animationScale);





        mTransaction = mTransactionPool.acquire();

        if (customRotate) {

        if (customRotate) {

            mRotateAlphaAnimation.initialize(mEndWidth, mEndHeight, mStartWidth, mStartHeight);

            mRotateAlphaAnimation.initialize(mEndWidth, mEndHeight, mStartWidth, mStartHeight);

            mRotateAlphaAnimation.restrictDuration(MAX_ANIMATION_DURATION);

            mRotateAlphaAnimation.restrictDuration(MAX_ANIMATION_DURATION);
@@ -386,23 +381,17 @@ class ScreenRotationAnimation { 
    }

    }





    public void kill() {

    public void kill() {

        Transaction t = mTransaction != null ? mTransaction : mTransactionPool.acquire();

        final Transaction t = mTransactionPool.acquire();

        if (mAnimLeash.isValid()) {

        if (mAnimLeash.isValid()) {

            t.remove(mAnimLeash);

            t.remove(mAnimLeash);

        }

        }





        if (mScreenshotLayer != null) {

        if (mScreenshotLayer != null && mScreenshotLayer.isValid()) {

            if (mScreenshotLayer.isValid()) {

            t.remove(mScreenshotLayer);

            t.remove(mScreenshotLayer);

        }

        }

            mScreenshotLayer = null;

        if (mBackColorSurface != null && mBackColorSurface.isValid()) {

        }

        if (mBackColorSurface != null) {

            if (mBackColorSurface.isValid()) {

            t.remove(mBackColorSurface);

            t.remove(mBackColorSurface);

        }

        }

            mBackColorSurface = null;

        }

        t.apply();

        t.apply();

        mTransactionPool.release(t);

        mTransactionPool.release(t);

    }

    }