| commit | d0e61e3eef629c3006ee22b3fec8a39d186bf77d | [log] [tgz] |
|---|---|---|
| author | Brian Isganitis <brianji@google.com> | Mon Jun 12 17:21:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 12 17:21:35 2023 +0000 |
| tree | 508beccf09775ef15c646f7358957e63ce502992 | |
| parent | 4522e5d2ec51e3171780b599cff895812cf62225 [diff] | |
| parent | 77a40999e1ce077acdf3399bf20d11850d5840c0 [diff] |
Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557 Change-Id: Iee6631b363e2abddc2f02c7fb32395c11f7d6b3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 008f5f6..17e7e1b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -551,6 +551,12 @@ // 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.
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 4710721..7e767fa 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -111,7 +111,8 @@ // 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