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

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

Merge "Set rotation layers as opaque initially" into tm-qpr-dev am: 27e88729 am: dba18dca 

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



Change-Id: Icc52c2c5a84fcc822e1ca301e0710e3ac73fbc7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eafa0cd3 dba18dca

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

+2 −4
Original line number Diff line number Diff line
@@ -162,13 +162,12 @@ class ScreenRotationAnimation { 
                    .setParent(mAnimLeash)

                    .setBLASTLayer()

                    .setSecure(screenshotBuffer.containsSecureLayers())

                    .setOpaque(true)

                    .setCallsite("ShellRotationAnimation")

                    .setName("RotationLayer")

                    .build();



            t.setLayer(mAnimLeash, SCREEN_FREEZE_LAYER_BASE);

            t.setPosition(mAnimLeash, 0, 0);

            t.setAlpha(mAnimLeash, 1);

            t.show(mAnimLeash);



            final ColorSpace colorSpace = screenshotBuffer.getColorSpace();
@@ -181,6 +180,7 @@ class ScreenRotationAnimation { 
                mBackColorSurface = new SurfaceControl.Builder(session)

                        .setParent(rootLeash)

                        .setColorLayer()

                        .setOpaque(true)

                        .setCallsite("ShellRotationAnimation")

                        .setName("BackColorSurface")

                        .build();
@@ -189,7 +189,6 @@ class ScreenRotationAnimation { 


                t.setLayer(mBackColorSurface, -1);

                t.setColor(mBackColorSurface, new float[]{mStartLuma, mStartLuma, mStartLuma});

                t.setAlpha(mBackColorSurface, 1);

                t.show(mBackColorSurface);

            }
@@ -242,7 +241,6 @@ class ScreenRotationAnimation { 
        t.setMatrix(mScreenshotLayer,

                mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y],

                mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]);

        t.setAlpha(mScreenshotLayer, (float) 1.0);

    }



    /**