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

Commit b916c323 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I7fdb282fd603e54f049df13b15c0101cc8338525
parents 5e295f28 f596b7c8

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

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

    public final boolean allowEnterPip;

    public final int rotationChange;

    public final int rotationChange;

    public final int windowType;

    public final int windowType;

    public final WindowConfiguration windowConfiguration;





    private final SurfaceControl mStartLeash;

    private final SurfaceControl mStartLeash;





    // Fields used only to unrap into RemoteAnimationTarget

    // Fields used only to unrap into RemoteAnimationTarget

    private final WindowConfiguration windowConfiguration;

    private final Rect startBounds;

    private final Rect startBounds;





    public RemoteAnimationTargetCompat(RemoteAnimationTarget app) {

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

        rotationChange = change.getEndRotation() - change.getStartRotation();

        windowType = INVALID_WINDOW_TYPE;

        windowType = INVALID_WINDOW_TYPE;





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

        windowConfiguration = change.getTaskInfo() != null

        windowConfiguration = new WindowConfiguration();

            ? change.getTaskInfo().configuration.windowConfiguration

            : new WindowConfiguration();

        startBounds = change.getStartAbsBounds();

        startBounds = change.getStartAbsBounds();

    }

    }