Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie4b8e2d1780d0c3cc1d38dbe7adf5e92bd2a12b1
This commit is contained in:
Automerger Merge Worker
2021-09-02 17:20:35 +00:00
parent 69af22713b d484e824be
commit 1a4d24dab1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}