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

Commit c6c929ee authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Keep mCanAffectSystemUiFlags to be false while in PiP" into...

Merge "Merge "Keep mCanAffectSystemUiFlags to be false while in PiP" into tm-qpr-dev am: ff78e98a am: 62a2d2e7"
parents f0f360a7 5b5874b2
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -4418,13 +4418,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();