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

Commit e462bfa8 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

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

Merge "Use the same name for PipContentOverlay variants" into tm-qpr-dev am: 98b21ffc am: 5bb15853 am: 299d7929

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21684059



Change-Id: I5e339d8e8128352ee9d68d06ec16aa2158754351
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 292628c0 299d7929

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

+6 −3
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ import android.window.TaskSnapshot; 
 * 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 @@ public abstract class PipContentOverlay { 
            mContext = context;

            mLeash = new SurfaceControl.Builder(new SurfaceSession())

                    .setCallsite(TAG)

                    .setName(TAG)

                    .setName(LAYER_NAME)

                    .setColorLayer()

                    .build();

        }
@@ -139,7 +142,7 @@ public abstract class PipContentOverlay { 
            mSourceRectHint = new Rect(sourceRectHint);

            mLeash = new SurfaceControl.Builder(new SurfaceSession())

                    .setCallsite(TAG)

                    .setName(TAG)

                    .setName(LAYER_NAME)

                    .build();

        }
@@ -194,7 +197,7 @@ public abstract class PipContentOverlay { 
            prepareAppIconOverlay(activityInfo);

            mLeash = new SurfaceControl.Builder(new SurfaceSession())

                    .setCallsite(TAG)

                    .setName(TAG)

                    .setName(LAYER_NAME)

                    .build();

        }