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

Merge "Remove starting destination bounds on BOUNDS PIP Shell Transition." into sc-v2-dev

Browse Source
This commit is contained in:
Ben Lin
2021-08-17 22:14:04 +00:00
committed by Android (Google) Code Review
parent d017fe35ce 4462de5dfd
commit dd39448385
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -613,7 +613,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
private void onEndOfSwipePipToHomeTransition() { private void onEndOfSwipePipToHomeTransition() {
if (Transitions.ENABLE_SHELL_TRANSITIONS) { if (Transitions.ENABLE_SHELL_TRANSITIONS) {
mPipTransitionState.setInSwipePipToHomeTransition(false);
mSwipePipToHomeOverlay = null; mSwipePipToHomeOverlay = null;
return; return;
} }

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
View File

@@ -170,9 +170,12 @@ public class PipTransition extends PipTransitionController {
if (request.getType() == TRANSIT_PIP) { if (request.getType() == TRANSIT_PIP) {
WindowContainerTransaction wct = new WindowContainerTransaction(); WindowContainerTransaction wct = new WindowContainerTransaction();
mPipTransitionState.setTransitionState(PipTransitionState.ENTRY_SCHEDULED); mPipTransitionState.setTransitionState(PipTransitionState.ENTRY_SCHEDULED);
if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {
wct.setActivityWindowingMode(request.getTriggerTask().token,
WINDOWING_MODE_UNDEFINED);
final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds(); final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
wct.setActivityWindowingMode(request.getTriggerTask().token, WINDOWING_MODE_UNDEFINED);
wct.setBounds(request.getTriggerTask().token, destinationBounds); wct.setBounds(request.getTriggerTask().token, destinationBounds);
}
return wct; return wct;
} else { } else {
return null; return null;
@@ -243,6 +246,7 @@ public class PipTransition extends PipTransitionController {
onFinishResize(taskInfo, destinationBounds, TRANSITION_DIRECTION_TO_PIP, tx); onFinishResize(taskInfo, destinationBounds, TRANSITION_DIRECTION_TO_PIP, tx);
sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP); sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP);
mFinishCallback = null; mFinishCallback = null;
mPipTransitionState.setInSwipePipToHomeTransition(false);
return true; return true;
} }