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

Commit 62a2d2e7 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Keep mCanAffectSystemUiFlags to be false while in PiP" into tm-qpr-dev am: ff78e98a 

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



Change-Id: I2f7540112504c85ab8178da2e7eb8d1d873f07a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 579a2e2c ff78e98a

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

+4 −4
Original line number Diff line number Diff line
@@ -4427,13 +4427,13 @@ class Task extends TaskFragment { 
                    : WINDOWING_MODE_FULLSCREEN;

        }

        if (currentMode == 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're

            // moving out of pip

            setCanAffectSystemUiFlags(true);

            mRootWindowContainer.notifyActivityPipModeChanged(this, 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);

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

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

                taskDisplayArea.getRootPinnedTask().dismissPip();