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

Merge "Reset override bounds when animating to fullscreen" into rvc-dev

Browse Source
This commit is contained in:
Winson Chung
2020-03-12 17:23:34 +00:00
committed by Android (Google) Code Review
parent be00a83ae2 d1674cd4a1
commit faf6a4d92f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -415,11 +415,16 @@ public class PipTaskOrganizer extends ITaskOrganizer.Stub {
}
mLastReportedBounds.set(destinationBounds);
try {
// If we are animating to fullscreen, then we need to reset the override bounds on the
// task to ensure that the task "matches" the parent's bounds
Rect taskBounds = direction == TRANSITION_DIRECTION_TO_FULLSCREEN
? null
: destinationBounds;
final WindowContainerTransaction wct = new WindowContainerTransaction();
if (direction == TRANSITION_DIRECTION_TO_PIP) {
wct.scheduleFinishEnterPip(mToken, destinationBounds);
wct.scheduleFinishEnterPip(mToken, taskBounds);
} else {
wct.setBounds(mToken, destinationBounds);
wct.setBounds(mToken, taskBounds);
}
wct.setBoundsChangeTransaction(mToken, tx);
mTaskOrganizerController.applyContainerTransaction(wct, null /* ITaskOrganizer */);

4
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -2224,9 +2224,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
.addTaggedData(MetricsEvent.FIELD_DISPLAY_ID, getDisplayId()));
}
// If there was no pinned stack, we still need to notify the controller of the display info
// update as a result of the config change.
if (mPinnedStackControllerLocked != null && !hasPinnedTask()) {
if (mPinnedStackControllerLocked != null) {
mPinnedStackControllerLocked.onDisplayInfoChanged(getDisplayInfo());
}
}