From 1f147ca08141b739745f6d179672361a5faa2d8f Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Tue, 30 Jun 2020 08:47:11 -0700 Subject: [PATCH] Launch to fullscreen when re-open from lockscreen and in PiP This is a regression from ag/11249465, when SysUI receives TaskStackChangeListener#onActivityRestartAttempt, it should animate the task in PiP to fullscreen despite the visibility (invisible in this case since it's behind the keyguard) it was. Video: http://rcll/aaaaaabFQoRHlzixHdtY/e0uQyiFgjC48UmWJ0mru1t Bug: 160002302 Test: Launch maps from lockscreen, see video Change-Id: I2d61ff7b90255b3184b5e5d7b994616aa46cb5c1 --- .../src/com/android/systemui/pip/phone/PipManager.java | 3 +-- .../SystemUI/src/com/android/systemui/pip/tv/PipManager.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index 75d3d0454755b..7d35416a8d1df 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -36,7 +36,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; @@ -176,7 +175,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; } diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java index 628223630af75..4b2c273210354 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java @@ -716,7 +716,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; }