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

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

Change-Id: I27f2e8b346c8234c791dbcadbaaf61464281eaa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-08-11 09:49:37 +00:00
committed by Automerger Merge Worker

View File

@@ -162,13 +162,12 @@ class ScreenRotationAnimation {
.setParent(mAnimLeash) .setParent(mAnimLeash)
.setBLASTLayer() .setBLASTLayer()
.setSecure(screenshotBuffer.containsSecureLayers()) .setSecure(screenshotBuffer.containsSecureLayers())
.setOpaque(true)
.setCallsite("ShellRotationAnimation") .setCallsite("ShellRotationAnimation")
.setName("RotationLayer") .setName("RotationLayer")
.build(); .build();
t.setLayer(mAnimLeash, SCREEN_FREEZE_LAYER_BASE); t.setLayer(mAnimLeash, SCREEN_FREEZE_LAYER_BASE);
t.setPosition(mAnimLeash, 0, 0);
t.setAlpha(mAnimLeash, 1);
t.show(mAnimLeash); t.show(mAnimLeash);
final ColorSpace colorSpace = screenshotBuffer.getColorSpace(); final ColorSpace colorSpace = screenshotBuffer.getColorSpace();
@@ -181,6 +180,7 @@ class ScreenRotationAnimation {
mBackColorSurface = new SurfaceControl.Builder(session) mBackColorSurface = new SurfaceControl.Builder(session)
.setParent(rootLeash) .setParent(rootLeash)
.setColorLayer() .setColorLayer()
.setOpaque(true)
.setCallsite("ShellRotationAnimation") .setCallsite("ShellRotationAnimation")
.setName("BackColorSurface") .setName("BackColorSurface")
.build(); .build();
@@ -189,7 +189,6 @@ class ScreenRotationAnimation {
t.setLayer(mBackColorSurface, -1); t.setLayer(mBackColorSurface, -1);
t.setColor(mBackColorSurface, new float[]{mStartLuma, mStartLuma, mStartLuma}); t.setColor(mBackColorSurface, new float[]{mStartLuma, mStartLuma, mStartLuma});
t.setAlpha(mBackColorSurface, 1);
t.show(mBackColorSurface); t.show(mBackColorSurface);
} }
@@ -242,7 +241,6 @@ class ScreenRotationAnimation {
t.setMatrix(mScreenshotLayer, t.setMatrix(mScreenshotLayer,
mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y], mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y],
mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]); mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]);
t.setAlpha(mScreenshotLayer, (float) 1.0);
} }
/** /**