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

Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68b1 am: 4ef0a619dc am: bc11bd8dfb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18357116

Change-Id: If02ef44cbcc1a94df44ebb9da89c31b1027a95e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-05-13 03:13:15 +00:00
committed by Automerger Merge Worker
parent 6dc87b758b bc11bd8dfb
commit 87dea80f45
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1296,7 +1296,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
*/
public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,
Consumer<Rect> updateBoundsCallback) {
if (mPipTransitionState.shouldBlockResizeRequest()) {
if (mPipTransitionState.shouldBlockResizeRequest()
|| mPipTransitionState.getInSwipePipToHomeTransition()) {
return;
}
if (mWaitForFixedRotation) {