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

Commit 1a4d24da authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Populate window configuration from TaskInfo." into sc-v2-dev am:... 

Merge "Merge "Populate window configuration from TaskInfo." into sc-v2-dev am: f596b7c8" into sc-v2-dev-plus-aosp am: d484e824

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

Change-Id: Ie4b8e2d1780d0c3cc1d38dbe7adf5e92bd2a12b1
parents 69af2271 d484e824

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java

+4 −3
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ public class RemoteAnimationTargetCompat { 
    public final boolean allowEnterPip;

    public final int rotationChange;

    public final int windowType;

    public final WindowConfiguration windowConfiguration;



    private final SurfaceControl mStartLeash;



    // Fields used only to unrap into RemoteAnimationTarget

    private final WindowConfiguration windowConfiguration;

    private final Rect startBounds;



    public RemoteAnimationTargetCompat(RemoteAnimationTarget app) {
@@ -235,8 +235,9 @@ public class RemoteAnimationTargetCompat { 
        rotationChange = change.getEndRotation() - change.getStartRotation();

        windowType = INVALID_WINDOW_TYPE;



        // TODO this probably isn't right but it's unused for now /shrug

        windowConfiguration = new WindowConfiguration();

        windowConfiguration = change.getTaskInfo() != null

            ? change.getTaskInfo().configuration.windowConfiguration

            : new WindowConfiguration();

        startBounds = change.getStartAbsBounds();

    }