commit c71c43db015c6ce51584bd6dd47a269e9cdfef92
author Hongwei Wang <hwwang@google.com> Wed Mar 01 14:27:42 2023 -0800
committer Hongwei Wang <hwwang@google.com> Fri Mar 03 13:55:47 2023 -0800
tree b72dd86fcc4ff3eb9ccc04eca7adf5cdeb1a1586
parent 09262ed09d8686e8b929b752942ba6a86d5dfc6f

Use the same name for PipContentOverlay variants

Flicker test relies on this name for component match.

Bug: 265998256
Test: atest WMShellFlickerTests:EnterPipOnUserLeaveHintTest
Change-Id: I843cd81e762207f37867065a3934be645dede614

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

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
index 480bf93..53bf42a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
@@ -39,6 +39,9 @@
  * Represents the content overlay used during the entering PiP animation.
  */
 public abstract class PipContentOverlay {
+    // Fixed string used in WMShellFlickerTests
+    protected static final String LAYER_NAME = "PipContentOverlay";
+
     protected SurfaceControl mLeash;
 
     /** Attaches the internal {@link #mLeash} to the given parent leash. */
@@ -86,7 +89,7 @@
             mContext = context;
             mLeash = new SurfaceControl.Builder(new SurfaceSession())
                     .setCallsite(TAG)
-                    .setName(TAG)
+                    .setName(LAYER_NAME)
                     .setColorLayer()
                     .build();
         }
@@ -139,7 +142,7 @@
             mSourceRectHint = new Rect(sourceRectHint);
             mLeash = new SurfaceControl.Builder(new SurfaceSession())
                     .setCallsite(TAG)
-                    .setName(TAG)
+                    .setName(LAYER_NAME)
                     .build();
         }
 
@@ -194,7 +197,7 @@
             prepareAppIconOverlay(activityInfo);
             mLeash = new SurfaceControl.Builder(new SurfaceSession())
                     .setCallsite(TAG)
-                    .setName(TAG)
+                    .setName(LAYER_NAME)
                     .build();
         }