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

Merge "Use getOutWindowingMode instead of WINDOWING_MODE_UNDEFINED" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-27 04:15:23 +00:00
committed by Android (Google) Code Review
parent 14376ccdcd 5a10672876
commit b7ca84c08a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -445,7 +445,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
// When exit to fullscreen with Shell transition enabled, we update the Task windowing // When exit to fullscreen with Shell transition enabled, we update the Task windowing
// mode directly so that it can also trigger display rotation and visibility update in // mode directly so that it can also trigger display rotation and visibility update in
// the same transition if there will be any. // the same transition if there will be any.
wct.setWindowingMode(mToken, WINDOWING_MODE_UNDEFINED); wct.setWindowingMode(mToken, getOutPipWindowingMode());
// We can inherit the parent bounds as it is going to be fullscreen. The // We can inherit the parent bounds as it is going to be fullscreen. The
// destinationBounds calculated above will be incorrect if this is with rotation. // destinationBounds calculated above will be incorrect if this is with rotation.
wct.setBounds(mToken, null); wct.setBounds(mToken, null);
@@ -544,7 +544,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
if (Transitions.ENABLE_SHELL_TRANSITIONS) { if (Transitions.ENABLE_SHELL_TRANSITIONS) {
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
wct.setBounds(mToken, null); wct.setBounds(mToken, null);
wct.setWindowingMode(mToken, WINDOWING_MODE_UNDEFINED); wct.setWindowingMode(mToken, getOutPipWindowingMode());
wct.reorder(mToken, false); wct.reorder(mToken, false);
mPipTransitionController.startExitTransition(TRANSIT_REMOVE_PIP, wct, mPipTransitionController.startExitTransition(TRANSIT_REMOVE_PIP, wct,
null /* destinationBounds */); null /* destinationBounds */);