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

Commit d484e824 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
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
parents d79bf964 b916c323
Loading
Loading
Loading
Loading
+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();
    }