| commit | 1a4d24dab1dc3095a3704ea4d18ec43d4d1448ce | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 02 17:20:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 02 17:20:35 2021 +0000 |
| tree | 2fb822f978319b972f308d7ac56fed39f5982f7b | |
| parent | 69af22713bae570c9cc961cfcc24f92220efc6a1 [diff] | |
| parent | d484e824be53a3c1ac64ff202a61efceda50ec9e [diff] |
Merge "Merge "Populate window configuration from TaskInfo." into sc-v2-dev am: f596b7c8f0" into sc-v2-dev-plus-aosp am: d484e824be Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15742275 Change-Id: Ie4b8e2d1780d0c3cc1d38dbe7adf5e92bd2a12b1
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(); }