From bd5c455302c26faef5e2bf8540ce0c123d31efe4 Mon Sep 17 00:00:00 2001
From: Holly Sun <jiuyu@google.com>
Date: Tue, 15 Apr 2025 13:17:48 -0700
Subject: [PATCH] Remove flag private_space_app_installer_button.

Bug: 409610010
Test: verified PS app install button stills works
Flag: EXEMPT flag removal
Change-Id: I7fd606ab0fd939bcb1202861d89c3996b241c105
---
 aconfig/launcher_search.aconfig                           | 7 -------
 .../com/android/launcher3/uioverrides/SystemApiWrapper.kt | 8 +-------
 .../android/launcher3/allapps/AlphabeticalAppsList.java   | 2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/aconfig/launcher_search.aconfig b/aconfig/launcher_search.aconfig
index 4fa91a4c4b..4fe5f8564a 100644
--- a/aconfig/launcher_search.aconfig
+++ b/aconfig/launcher_search.aconfig
@@ -22,13 +22,6 @@ flag {
     bug: "308054233"
 }
 
-flag {
-    name: "private_space_app_installer_button"
-    namespace: "launcher_search"
-    description: "This flag enables addition of App Installer button in Private Space container."
-    bug: "308064949"
-}
-
 flag {
     name: "private_space_restrict_accessibility_drag"
     namespace: "launcher_search"
diff --git a/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt b/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt
index 9df40e7749..8bdf4943b9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt
+++ b/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt
@@ -35,8 +35,6 @@ import android.util.ArrayMap
 import android.widget.Toast
 import android.window.RemoteTransition
 import com.android.launcher3.Flags.enablePrivateSpace
-import com.android.launcher3.Flags.enablePrivateSpaceInstallShortcut
-import com.android.launcher3.Flags.privateSpaceAppInstallerButton
 import com.android.launcher3.Flags.privateSpaceSysAppsSeparation
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
@@ -96,11 +94,7 @@ open class SystemApiWrapper @Inject constructor(@ApplicationContext context: Con
         else ArrayList()
 
     override fun getAppMarketActivityIntent(packageName: String, user: UserHandle): Intent =
-        if (
-            allowPrivateProfile() &&
-                enablePrivateSpace() &&
-                (privateSpaceAppInstallerButton() || enablePrivateSpaceInstallShortcut())
-        )
+        if (allowPrivateProfile() && enablePrivateSpace())
             ProxyActivityStarter.getLaunchIntent(
                 mContext,
                 StartActivityParams(null as PendingIntent?, 0).apply {
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 01f7389c28..af0b842c02 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -387,7 +387,7 @@ public class AlphabeticalAppsList<T extends Context & ActivityContext> implement
 
     private int addPrivateSpaceApps(int position) {
         // Add Install Apps Button first.
-        if (Flags.privateSpaceAppInstallerButton() && !enableMovingContentIntoPrivateSpace()) {
+        if (!enableMovingContentIntoPrivateSpace()) {
             mPrivateProviderManager.addPrivateSpaceInstallAppButton(mAdapterItems);
             position++;
         }