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

Merge "Avoid fullscreen bounds check while exiting pip" into udc-dev am: 7f3ff219a2

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

Change-Id: Ib71d985717dd4e93a2797c128f497b46f1ccd25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ikram Gabiyev
2023-06-28 18:39:26 +00:00
committed by Automerger Merge Worker
parent 4bcace2527 7f3ff219a2
commit 7547bbff49
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -567,7 +567,16 @@ public class PipTransition extends PipTransitionController {
mPipBoundsState.getDisplayBounds()); mPipBoundsState.getDisplayBounds());
mFinishCallback = (wct, wctCB) -> { mFinishCallback = (wct, wctCB) -> {
mPipOrganizer.onExitPipFinished(taskInfo); mPipOrganizer.onExitPipFinished(taskInfo);
if (!Transitions.SHELL_TRANSITIONS_ROTATION && toFullscreen) {
// TODO(b/286346098): remove the OPEN app flicker completely
// not checking if we go to fullscreen helps avoid getting pip into an inconsistent
// state after the flicker occurs. This is a temp solution until flicker is removed.
if (!Transitions.SHELL_TRANSITIONS_ROTATION) {
// will help to debug the case when we are not exiting to fullscreen
if (!toFullscreen) {
ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
"%s: startExitAnimation() not exiting to fullscreen", TAG);
}
wct = wct != null ? wct : new WindowContainerTransaction(); wct = wct != null ? wct : new WindowContainerTransaction();
wct.setBounds(pipTaskToken, null); wct.setBounds(pipTaskToken, null);
mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP); mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP);