Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing ColorFade animation in landscape mode" into udc-dev

Browse Source
This commit is contained in:
Oleg Petšjonkin
2023-04-27 08:31:09 +00:00
committed by Android (Google) Code Review
parent 55c562fa32 f74a62ac21
commit ee87596ce0
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/display/ColorFade.java
View File

@@ -191,7 +191,7 @@ final class ColorFade {
} }
if (!(createEglContext(isProtected) && createEglSurface(isProtected, isWideColor) if (!(createEglContext(isProtected) && createEglSurface(isProtected, isWideColor)
&& setScreenshotTextureAndSetViewport(hardwareBuffer))) { && setScreenshotTextureAndSetViewport(hardwareBuffer, displayInfo.rotation))) {
dismiss(); dismiss();
return false; return false;
} }
@@ -500,7 +500,8 @@ final class ColorFade {
} }
private boolean setScreenshotTextureAndSetViewport( private boolean setScreenshotTextureAndSetViewport(
ScreenCapture.ScreenshotHardwareBuffer screenshotBuffer) { ScreenCapture.ScreenshotHardwareBuffer screenshotBuffer,
@Surface.Rotation int rotation) {
if (!attachEglContext()) { if (!attachEglContext()) {
return false; return false;
} }
@@ -525,14 +526,22 @@ final class ColorFade {
s.release(); s.release();
st.release(); st.release();
} }
// if screen is rotated, map texture starting different corner
int indexDelta = (rotation == Surface.ROTATION_90) ? 2
: (rotation == Surface.ROTATION_180) ? 4
: (rotation == Surface.ROTATION_270) ? 6 : 0;
// Set up texture coordinates for a quad. // Set up texture coordinates for a quad.
// We might need to change this if the texture ends up being // We might need to change this if the texture ends up being
// a different size from the display for some reason. // a different size from the display for some reason.
mTexCoordBuffer.put(0, 0f); mTexCoordBuffer.put(1, 0f); mTexCoordBuffer.put(indexDelta, 0f);
mTexCoordBuffer.put(2, 0f); mTexCoordBuffer.put(3, 1f); mTexCoordBuffer.put(indexDelta + 1, 0f);
mTexCoordBuffer.put(4, 1f); mTexCoordBuffer.put(5, 1f); mTexCoordBuffer.put((indexDelta + 2) % 8, 0f);
mTexCoordBuffer.put(6, 1f); mTexCoordBuffer.put(7, 0f); mTexCoordBuffer.put((indexDelta + 3) % 8, 1f);
mTexCoordBuffer.put((indexDelta + 4) % 8, 1f);
mTexCoordBuffer.put((indexDelta + 5) % 8, 1f);
mTexCoordBuffer.put((indexDelta + 6) % 8, 1f);
mTexCoordBuffer.put((indexDelta + 7) % 8, 0f);
// Set up our viewport. // Set up our viewport.
GLES20.glViewport(0, 0, mDisplayWidth, mDisplayHeight); GLES20.glViewport(0, 0, mDisplayWidth, mDisplayHeight);

1
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -2548,7 +2548,6 @@ public final class DisplayManagerService extends SystemService {
final DisplayInfo displayInfo = logicalDisplay.getDisplayInfoLocked(); final DisplayInfo displayInfo = logicalDisplay.getDisplayInfoLocked();
captureArgs = new ScreenCapture.DisplayCaptureArgs.Builder(token) captureArgs = new ScreenCapture.DisplayCaptureArgs.Builder(token)
.setSize(displayInfo.getNaturalWidth(), displayInfo.getNaturalHeight()) .setSize(displayInfo.getNaturalWidth(), displayInfo.getNaturalHeight())
.setUseIdentityTransform(true)
.setCaptureSecureLayers(true) .setCaptureSecureLayers(true)
.setAllowProtected(true) .setAllowProtected(true)
.build(); .build();