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

Fix issue with updating canAffectSystemUiFlags when swiping up with PIP am: 608b5a2691 am: 2e3bf28efa

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

Change-Id: I14c05906466e90d2dd8b3149bc01f337a52f1150
This commit is contained in:
Winson Chung
2021-05-26 05:43:28 +00:00
committed by Automerger Merge Worker
parent 510f17add0 2e3bf28efa
commit 0a4ff2cb69
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/RecentsAnimationController.java
View File

@@ -1163,9 +1163,6 @@ public class RecentsAnimationController implements DeathRecipient {
// Apply the task's pending transaction in case it is detached and its transaction // Apply the task's pending transaction in case it is detached and its transaction
// is not reachable. // is not reachable.
mTask.getPendingTransaction().apply(); mTask.getPendingTransaction().apply();
// Reset whether this task can affect the sysui flags
mTask.setCanAffectSystemUiFlags(true);
} }
} }

14
services/core/java/com/android/server/wm/Task.java
View File

@@ -5408,17 +5408,17 @@ class Task extends WindowContainer<WindowContainer> {
: WINDOWING_MODE_FULLSCREEN; : WINDOWING_MODE_FULLSCREEN;
} }
if (currentMode == WINDOWING_MODE_PINNED) { if (currentMode == WINDOWING_MODE_PINNED) {
mRootWindowContainer.notifyActivityPipModeChanged(null);
}
if (likelyResolvedMode == WINDOWING_MODE_PINNED) {
// In the case that we've disabled affecting the SysUI flags as a part of seamlessly // In the case that we've disabled affecting the SysUI flags as a part of seamlessly
// transferring the transform on the leash to the task, reset this state once we've // transferring the transform on the leash to the task, reset this state once we've
// actually entered pip // actually entered pip
setCanAffectSystemUiFlags(true); setCanAffectSystemUiFlags(true);
mRootWindowContainer.notifyActivityPipModeChanged(null); if (taskDisplayArea.getRootPinnedTask() != null) {
} // Can only have 1 pip at a time, so replace an existing pip
if (likelyResolvedMode == WINDOWING_MODE_PINNED taskDisplayArea.getRootPinnedTask().dismissPip();
&& taskDisplayArea.getRootPinnedTask() != null) { }
// Can only have 1 pip at a time, so replace an existing pip
taskDisplayArea.getRootPinnedTask().dismissPip();
} }
if (likelyResolvedMode != WINDOWING_MODE_FULLSCREEN if (likelyResolvedMode != WINDOWING_MODE_FULLSCREEN
&& topActivity != null && !topActivity.noDisplay && topActivity != null && !topActivity.noDisplay