Merge "Merge "Populate window configuration from TaskInfo." into sc-v2-dev am: f596b7c8f0" into sc-v2-dev-plus-aosp
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java
index 0a14657..30db136 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java
@@ -71,11 +71,11 @@
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 @@
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();
}