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

Browse Source
This commit is contained in:
Automerger Merge Worker
2021-09-02 17:18:16 +00:00
committed by Android (Google) Code Review
parent d79bf96461 b916c32346
commit d484e824be
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 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();
} }