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

Merge "Use the same name for PipContentOverlay variants" into tm-qpr-dev

Browse Source
This commit is contained in:
Hongwei Wang
2023-03-06 17:13:53 +00:00
committed by Android (Google) Code Review
parent d2d4b4c216 c71c43db01
commit 98b21ffca9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
View File

@@ -39,6 +39,9 @@ import android.window.TaskSnapshot;
* Represents the content overlay used during the entering PiP animation. * Represents the content overlay used during the entering PiP animation.
*/ */
public abstract class PipContentOverlay { public abstract class PipContentOverlay {
// Fixed string used in WMShellFlickerTests
protected static final String LAYER_NAME = "PipContentOverlay";
protected SurfaceControl mLeash; protected SurfaceControl mLeash;
/** Attaches the internal {@link #mLeash} to the given parent leash. */ /** Attaches the internal {@link #mLeash} to the given parent leash. */
@@ -86,7 +89,7 @@ public abstract class PipContentOverlay {
mContext = context; mContext = context;
mLeash = new SurfaceControl.Builder(new SurfaceSession()) mLeash = new SurfaceControl.Builder(new SurfaceSession())
.setCallsite(TAG) .setCallsite(TAG)
.setName(TAG) .setName(LAYER_NAME)
.setColorLayer() .setColorLayer()
.build(); .build();
} }
@@ -139,7 +142,7 @@ public abstract class PipContentOverlay {
mSourceRectHint = new Rect(sourceRectHint); mSourceRectHint = new Rect(sourceRectHint);
mLeash = new SurfaceControl.Builder(new SurfaceSession()) mLeash = new SurfaceControl.Builder(new SurfaceSession())
.setCallsite(TAG) .setCallsite(TAG)
.setName(TAG) .setName(LAYER_NAME)
.build(); .build();
} }
@@ -194,7 +197,7 @@ public abstract class PipContentOverlay {
prepareAppIconOverlay(activityInfo); prepareAppIconOverlay(activityInfo);
mLeash = new SurfaceControl.Builder(new SurfaceSession()) mLeash = new SurfaceControl.Builder(new SurfaceSession())
.setCallsite(TAG) .setCallsite(TAG)
.setName(TAG) .setName(LAYER_NAME)
.build(); .build();
} }