Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c71c43db authored by Hongwei Wang's avatar Hongwei Wang
Browse files

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
parent 09262ed0

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -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();

        }

        }