Remove flag private_space_app_installer_button.
Bug: 409610010 Test: verified PS app install button stills works Flag: EXEMPT flag removal Change-Id: I7fd606ab0fd939bcb1202861d89c3996b241c105
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user