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

Merge "Do not skip onMovementBoundsChanged if already in PiP" into sc-v2-dev

Browse Source
This commit is contained in:
Hongwei Wang
2021-06-19 16:52:50 +00:00
committed by Android (Google) Code Review
parent 5ccd28488d 298da246f0
commit b346d3a64c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -828,11 +828,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
WindowContainerTransaction wct) { WindowContainerTransaction wct) {
// note that this can be called when swipe-to-home or fixed-rotation is happening. // note that this can be called when swipe-to-home or fixed-rotation is happening.
// Skip this entirely if that's the case. // Skip this entirely if that's the case.
if ((mInSwipePipToHomeTransition || mWaitForFixedRotation) && fromRotation) { final boolean waitForFixedRotationOnEnteringPip = mWaitForFixedRotation
&& (mPipTransitionState.getTransitionState() != PipTransitionState.ENTERED_PIP);
if ((mInSwipePipToHomeTransition || waitForFixedRotationOnEnteringPip) && fromRotation) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Skip onMovementBoundsChanged on rotation change" Log.d(TAG, "Skip onMovementBoundsChanged on rotation change"
+ " mInSwipePipToHomeTransition=" + mInSwipePipToHomeTransition + " mInSwipePipToHomeTransition=" + mInSwipePipToHomeTransition
+ " mWaitForFixedRotation=" + mWaitForFixedRotation); + " mWaitForFixedRotation=" + mWaitForFixedRotation
+ " getTransitionState=" + mPipTransitionState.getTransitionState());
} }
return; return;
} }