From fd896ed6bd34d7e078ff49b789a16968e1a5fdf5 Mon Sep 17 00:00:00 2001
From: Brian Isganitis <brianji@google.com>
Date: Wed, 7 Jun 2023 12:40:38 -0400
Subject: [PATCH] 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.