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

Merge "Keep PIP screenshot layer below input consumer layer" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2021-05-21 03:33:30 +00:00
committed by Android (Google) Code Review
parent fe4efedb7c ef3443f2cc
commit f369d35b27
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/common/ScreenshotUtils.java
View File

@@ -32,11 +32,12 @@ public class ScreenshotUtils {
* @param t the transaction used to set changes on the resulting screenshot. * @param t the transaction used to set changes on the resulting screenshot.
* @param sc the SurfaceControl to take a screenshot of * @param sc the SurfaceControl to take a screenshot of
* @param crop the crop to use when capturing the screenshot * @param crop the crop to use when capturing the screenshot
* @param layer the layer to place the screenshot
* *
* @return A SurfaceControl where the screenshot will be attached, or null if failed. * @return A SurfaceControl where the screenshot will be attached, or null if failed.
*/ */
public static SurfaceControl takeScreenshot(SurfaceControl.Transaction t, SurfaceControl sc, public static SurfaceControl takeScreenshot(SurfaceControl.Transaction t, SurfaceControl sc,
Rect crop) { Rect crop, int layer) {
final SurfaceControl.ScreenshotHardwareBuffer buffer = SurfaceControl.captureLayers( final SurfaceControl.ScreenshotHardwareBuffer buffer = SurfaceControl.captureLayers(
new SurfaceControl.LayerCaptureArgs.Builder(sc) new SurfaceControl.LayerCaptureArgs.Builder(sc)
.setSourceCrop(crop) .setSourceCrop(crop)
@@ -60,7 +61,7 @@ public class ScreenshotUtils {
t.setBuffer(screenshot, graphicBuffer); t.setBuffer(screenshot, graphicBuffer);
t.setColorSpace(screenshot, buffer.getColorSpace()); t.setColorSpace(screenshot, buffer.getColorSpace());
t.reparent(screenshot, sc); t.reparent(screenshot, sc);
t.setLayer(screenshot, Integer.MAX_VALUE); t.setLayer(screenshot, layer);
t.show(screenshot); t.show(screenshot);
t.apply(); t.apply();
return screenshot; return screenshot;

5
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -1159,8 +1159,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
preResizeBounds.offsetTo(0, 0); preResizeBounds.offsetTo(0, 0);
final Rect snapshotDest = new Rect(0, 0, destinationBounds.width(), final Rect snapshotDest = new Rect(0, 0, destinationBounds.width(),
destinationBounds.height()); destinationBounds.height());
// Note: Put this at layer=MAX_VALUE-2 since the input consumer for PIP is placed at
// MAX_VALUE-1
final SurfaceControl snapshotSurface = ScreenshotUtils.takeScreenshot( final SurfaceControl snapshotSurface = ScreenshotUtils.takeScreenshot(
mSurfaceControlTransactionFactory.getTransaction(), mLeash, preResizeBounds); mSurfaceControlTransactionFactory.getTransaction(), mLeash, preResizeBounds,
Integer.MAX_VALUE - 2);
if (snapshotSurface != null) { if (snapshotSurface != null) {
mSyncTransactionQueue.queue(wct); mSyncTransactionQueue.queue(wct);
mSyncTransactionQueue.runInSync(t -> { mSyncTransactionQueue.runInSync(t -> {