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

Commit 46750d6a 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 rvc-dev am: c99594ee 

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

Change-Id: I303e9d6c6ba461e305703b23a62b206fd34ee475
parents 47029fe4 c99594ee

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

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

import android.util.Pair;

import android.view.DisplayInfo;

import android.view.DisplayInfo;

import android.view.IPinnedStackController;

import android.view.IPinnedStackController;

import android.view.SurfaceControl;

import android.window.WindowContainerTransaction;

import android.window.WindowContainerTransaction;





import com.android.systemui.Dependency;

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

        @Override

        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,

        public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,

                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {

                boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {

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

            if (task.configuration.windowConfiguration.getWindowingMode()

                    != WINDOWING_MODE_PINNED) {

                    != WINDOWING_MODE_PINNED) {

                return;

                return;

            }

            }

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

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

        @Override

        public void onActivityRestartAttempt(RunningTaskInfo task, boolean homeTaskVisible,

        public void onActivityRestartAttempt(RunningTaskInfo task, boolean homeTaskVisible,

                boolean clearedTask, boolean wasVisible) {

                boolean clearedTask, boolean wasVisible) {

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

            if (task.configuration.windowConfiguration.getWindowingMode()

                    != WINDOWING_MODE_PINNED) {

                    != WINDOWING_MODE_PINNED) {

                return;

                return;

            }

            }