From 0b22c5d9eeb84f7f6acce82244edcb89c34a10e7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 10 Apr 2025 12:26:29 -0700
Subject: [PATCH] Cleaning up useActivityOverlay flag

Bug: 409606388
Test: Presubmit
Flag: EXEMPT cleanup
Change-Id: I0c9b4885dc6d8678b85443571d4714921825c1eb
---
 aconfig/launcher.aconfig                                  | 7 -------
 .../launcher3/taskbar/LauncherTaskbarUIController.java    | 8 ++------
 quickstep/src/com/android/quickstep/InputConsumerUtils.kt | 5 ++---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index 6ab2e106f5..abf3e456d4 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -173,13 +173,6 @@ flag {
   }
 }
 
-flag {
-    name: "use_activity_overlay"
-    namespace: "launcher"
-    description: "Use an activity for home screen overlay"
-    bug: "273828110"
-}
-
 flag {
     name: "enable_grid_migration_fix"
     namespace: "launcher"
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index 483301b608..5d1884c5b9 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -133,10 +133,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
         }
 
         mHomeState.addListener(mVisibilityChangeListener);
-        onLauncherVisibilityChanged(
-                Flags.useActivityOverlay()
-                        ? mHomeState.isHomeVisible() : mLauncher.hasBeenResumed(),
-                true /* fromInit */);
+        onLauncherVisibilityChanged(mHomeState.isHomeVisible(), true /* fromInit */);
 
         onStashedInAppChanged(mLauncher.getDeviceProfile());
         mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener);
@@ -295,8 +292,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
 
     @Override
     public void refreshResumedState() {
-        onLauncherVisibilityChanged(Flags.useActivityOverlay()
-                ? mHomeState.isHomeVisible() : mLauncher.hasBeenResumed());
+        onLauncherVisibilityChanged(mHomeState.isHomeVisible());
     }
 
     @Override
diff --git a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt
index 0bbd5a8f89..1f4b902661 100644
--- a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt
+++ b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt
@@ -552,12 +552,11 @@ object InputConsumerUtils {
             container.isResumed() && !previousGestureState.isRecentsAnimationRunning
         // If a task fragment within Launcher is resumed
         val launcherChildActivityResumed =
-            (com.android.launcher3.Flags.useActivityOverlay() &&
-                runningTask != null &&
+            runningTask != null &&
                 runningTask.isHomeTask &&
                 !previousGestureState.isRecentsAnimationRunning &&
                 overviewComponentObserver.isHomeAndOverviewSame &&
-                container.isLauncherOverlayShowing)
+                container.isLauncherOverlayShowing
 
         return if (container.isInLiveTileMode()) {
             createOverviewInputConsumer<S, T>(