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

Merge "Extract common operations for screenshot layer" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-03-22 13:54:48 +00:00
committed by Android (Google) Code Review
parent aecfa045ab 1382df9d8f
commit 4e72786e5f
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/policy/TransitionAnimation.java
View File

@@ -1297,6 +1297,17 @@ public class TransitionAnimation {
return set; return set;
} }
/** Sets the default attributes of the screenshot layer used for animation. */
public static void configureScreenshotLayer(SurfaceControl.Transaction t, SurfaceControl layer,
ScreenCapture.ScreenshotHardwareBuffer buffer) {
t.setBuffer(layer, buffer.getHardwareBuffer());
t.setDataSpace(layer, buffer.getColorSpace().getDataSpace());
// Avoid showing dimming effect for HDR content when running animation.
if (buffer.containsHdrLayers()) {
t.setDimmingEnabled(layer, false);
}
}
/** Returns whether the hardware buffer passed in is marked as protected. */ /** Returns whether the hardware buffer passed in is marked as protected. */
public static boolean hasProtectedContent(HardwareBuffer hardwareBuffer) { public static boolean hasProtectedContent(HardwareBuffer hardwareBuffer) {
return (hardwareBuffer.getUsage() & HardwareBuffer.USAGE_PROTECTED_CONTENT) return (hardwareBuffer.getUsage() & HardwareBuffer.USAGE_PROTECTED_CONTENT)

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

@@ -31,7 +31,6 @@ import android.animation.ValueAnimator;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.ColorSpace;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Rect; import android.graphics.Rect;
import android.hardware.HardwareBuffer; import android.hardware.HardwareBuffer;
@@ -162,13 +161,12 @@ class ScreenRotationAnimation {
.setName("RotationLayer") .setName("RotationLayer")
.build(); .build();
final ColorSpace colorSpace = screenshotBuffer.getColorSpace(); TransitionAnimation.configureScreenshotLayer(t, mScreenshotLayer, screenshotBuffer);
final HardwareBuffer hardwareBuffer = screenshotBuffer.getHardwareBuffer(); final HardwareBuffer hardwareBuffer = screenshotBuffer.getHardwareBuffer();
t.setDataSpace(mScreenshotLayer, colorSpace.getDataSpace());
t.setBuffer(mScreenshotLayer, hardwareBuffer);
t.show(mScreenshotLayer); t.show(mScreenshotLayer);
if (!isCustomRotate()) { if (!isCustomRotate()) {
mStartLuma = TransitionAnimation.getBorderLuma(hardwareBuffer, colorSpace); mStartLuma = TransitionAnimation.getBorderLuma(hardwareBuffer,
screenshotBuffer.getColorSpace());
} }
hardwareBuffer.close(); hardwareBuffer.close();
} }

4
services/core/java/com/android/server/wm/Transition.java
View File

@@ -2732,9 +2732,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
buffer, screenshotBuffer.getColorSpace()); buffer, screenshotBuffer.getColorSpace());
} }
SurfaceControl.Transaction t = wc.mWmService.mTransactionFactory.get(); SurfaceControl.Transaction t = wc.mWmService.mTransactionFactory.get();
TransitionAnimation.configureScreenshotLayer(t, snapshotSurface, screenshotBuffer);
t.setBuffer(snapshotSurface, buffer);
t.setDataSpace(snapshotSurface, screenshotBuffer.getColorSpace().getDataSpace());
t.show(snapshotSurface); t.show(snapshotSurface);
// Place it on top of anything else in the container. // Place it on top of anything else in the container.