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

Commit 8ddd75e4 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into... 

Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee am: 46750d6a am: c3b05a8a am: b1e08628

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

Change-Id: If0ee71fc8782f971e3db7112b1f0e70bc63b4a45
parents 45b1a58b b1e08628

packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.util.Log; 
import android.util.Pair;

import android.view.DisplayInfo;

import android.view.IPinnedStackController;

import android.view.SurfaceControl;

import android.window.WindowContainerTransaction;



import com.android.systemui.Dependency;
@@ -177,7 +176,7 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 
        @Override

        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,

                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {

            if (!wasVisible || task.configuration.windowConfiguration.getWindowingMode()

            if (task.configuration.windowConfiguration.getWindowingMode()

                    != WINDOWING_MODE_PINNED) {

                return;

            }

packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 
        @Override

        public void onActivityRestartAttempt(RunningTaskInfo task, boolean homeTaskVisible,

                boolean clearedTask, boolean wasVisible) {

            if (!wasVisible || task.configuration.windowConfiguration.getWindowingMode()

            if (task.configuration.windowConfiguration.getWindowingMode()

                    != WINDOWING_MODE_PINNED) {

                return;

            }