Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df34b606 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Fix issue with updating canAffectSystemUiFlags when swiping up with PIP am:... 

Fix issue with updating canAffectSystemUiFlags when swiping up with PIP am: 608b5a26 am: 2e3bf28e am: 0a4ff2cb

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

Change-Id: Ia27d1ed64b70753df2174e8a8130d49f1ee9d5f4
parents 88399c98 0a4ff2cb

services/core/java/com/android/server/wm/RecentsAnimationController.java

+0 −3
Original line number Diff line number Diff line
@@ -1163,9 +1163,6 @@ public class RecentsAnimationController implements DeathRecipient { 
                // Apply the task's pending transaction in case it is detached and its transaction

                // is not reachable.

                mTask.getPendingTransaction().apply();



                // Reset whether this task can affect the sysui flags

                mTask.setCanAffectSystemUiFlags(true);

            }

        }

services/core/java/com/android/server/wm/Task.java

+7 −7
Original line number Diff line number Diff line
@@ -5408,18 +5408,18 @@ class Task extends WindowContainer<WindowContainer> { 
                    : WINDOWING_MODE_FULLSCREEN;

        }

        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

            // transferring the transform on the leash to the task, reset this state once we've

            // actually entered pip

            setCanAffectSystemUiFlags(true);

            mRootWindowContainer.notifyActivityPipModeChanged(null);

        }

        if (likelyResolvedMode == WINDOWING_MODE_PINNED

                && taskDisplayArea.getRootPinnedTask() != null) {



            if (taskDisplayArea.getRootPinnedTask() != null) {

                // Can only have 1 pip at a time, so replace an existing pip

                taskDisplayArea.getRootPinnedTask().dismissPip();

            }

        }

        if (likelyResolvedMode != WINDOWING_MODE_FULLSCREEN

                && topActivity != null && !topActivity.noDisplay

                && topActivity.canForceResizeNonResizable(likelyResolvedMode)) {