Remove flag "enable_shortcut_dont_suggest_app" since it's eligible to be removed.
Bug: 409611054
Test: Presubmit, Verified "Don't suggest app" shortcut works fine for predicted apps.
Flag: EXEMPT Flag removal
Change-Id: Icb92f3519760ad0dc27e10d9690505c737b9dd25
diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index 6ab2e10..024fb07 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -93,13 +93,6 @@
}
flag {
- name: "enable_shortcut_dont_suggest_app"
- namespace: "launcher"
- description: "Enables don't suggest app shortcut for suggested apps"
- bug: "319250810"
-}
-
-flag {
name: "enable_support_for_archiving"
namespace: "launcher"
description: "Enables support for archived apps in Launcher3, such as empty progress bar etc."
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index ffd06d5..1fbbb27 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -497,12 +497,10 @@
shortcuts.addAll(getSplitShortcuts());
shortcuts.add(WIDGETS);
shortcuts.add(INSTALL);
+ shortcuts.add(DONT_SUGGEST_APP);
if (Flags.enablePrivateSpaceInstallShortcut()) {
shortcuts.add(PRIVATE_PROFILE_INSTALL);
}
- if (Flags.enableShortcutDontSuggestApp()) {
- shortcuts.add(DONT_SUGGEST_APP);
- }
if (Flags.enablePrivateSpace()) {
shortcuts.add(UNINSTALL_APP);
}
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index d09da0a..cd20acb 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -155,10 +155,8 @@
}
return INVALID;
} else if (info.isPredictedItem()) {
- if (Flags.enableShortcutDontSuggestApp()) {
- return INVALID;
- }
- return DISMISS_PREDICTION;
+ // For predicted apps we show only one drop target "cancel" and no secondary drop target
+ return INVALID;
}
Boolean uninstallDisabled = mUninstallDisabledCache.get(info.user);
