From 63582a0a0043f1f38e57d180142088034221e777 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Wed, 7 Jun 2023 18:26:58 -0400 Subject: [PATCH 1/2] Report unstashed content insets for notification panel. Test: FlickerTests, manual Bug: 284314711 Flag: no Change-Id: Ide7027454f8b447f82778c8e24dbc39c5ade0248 --- .../com/android/launcher3/taskbar/TaskbarStashController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 00e14adf07..4f2d5df4ce 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -111,7 +111,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba // Currently any flag that causes us to stash in an app is included, except for IME or All Apps // since those cover the underlying app anyway and thus the app shouldn't change insets. private static final int FLAGS_REPORT_STASHED_INSETS_TO_APP = FLAGS_STASHED_IN_APP - & ~FLAG_STASHED_IN_APP_IME & ~FLAG_STASHED_IN_TASKBAR_ALL_APPS; + & ~FLAG_STASHED_IN_APP_IME & ~FLAG_STASHED_IN_TASKBAR_ALL_APPS + & ~FLAG_STASHED_IN_APP_SYSUI; // If any of these flags are enabled, the taskbar must be stashed. private static final int FLAGS_FORCE_STASHED = FLAG_STASHED_SYSUI | FLAG_STASHED_DEVICE_LOCKED From fd896ed6bd34d7e078ff49b789a16968e1a5fdf5 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Wed, 7 Jun 2023 12:40:38 -0400 Subject: [PATCH 2/2] Make sure FLAG_IN_APP is set when launching apps from keyguard. This flag was not being set in the case where you lock from launcher and then unlock by tapping on launcheable items from keyguard such as home controls, notifications, smartspace, etc. This change makes sure we double check if we are unlocking to launcher or not and then setting FLAG_IN_APP accordingly. Test: manual Fix: 284314711 Change-Id: If46697566d252c649a00a7b3d728a14789dc6aed --- .../launcher3/taskbar/TaskbarLauncherStateController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 008f5f6755..17e7e1b9bb 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -551,6 +551,12 @@ public class TaskbarLauncherStateController { // updateValue ensures onIconAlignmentRatioChanged will be called if there is an actual // change in value mIconAlignment.updateValue(toAlignment); + + // Make sure FLAG_IN_APP is set when launching applications from keyguard. + if (!isInLauncher) { + mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true); + mControllers.taskbarStashController.applyState(0); + } } else if (mIconAlignment.isAnimatingToValue(toAlignment) || mIconAlignment.isSettledOnValue(toAlignment)) { // Already at desired value, but make sure we run the callback at the end.