Add remove system shortcut to folder items

Bug: 419289205
Test: NexusLauncherImageTests
Flag: com.android.launcher3.enable_long_press_remove_shortcut
Change-Id: I4bba230d13696d8d9dc02e232f8a302ae9e893e0
This commit is contained in:
Federico Baron
2025-06-06 22:02:32 +00:00
parent ab09085dbd
commit ffd3ced53f
2 changed files with 4 additions and 2 deletions
@@ -505,7 +505,8 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
shortcuts.add(WIDGETS);
shortcuts.add(INSTALL);
if (Flags.enableLongPressRemoveShortcut()
&& (container == CONTAINER_HOTSEAT || container == CONTAINER_DESKTOP)) {
&& (container == CONTAINER_HOTSEAT || container == CONTAINER_DESKTOP
|| /* Folder */ container > 0)) {
shortcuts.add(REMOVE);
}
shortcuts.add(DONT_SUGGEST_APP);
@@ -1,5 +1,6 @@
package com.android.launcher3.popup;
import static com.android.launcher3.AbstractFloatingView.TYPE_FOLDER;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DISMISS_PREDICTION_UNDO;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_PRIVATE_SPACE_INSTALL_SYSTEM_SHORTCUT_TAP;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_PRIVATE_SPACE_UNINSTALL_SYSTEM_SHORTCUT_TAP;
@@ -259,7 +260,7 @@ public abstract class SystemShortcut<T extends ActivityContext> extends ItemInfo
@Override
public void onClick(View view) {
AbstractFloatingView.closeAllOpenViews(mTarget);
AbstractFloatingView.closeAllOpenViewsExcept(mTarget, TYPE_FOLDER);
DropTargetHandler dropTargetHandler =
ActivityContext.lookupContext(view.getContext()).getDropTargetHandler();
dropTargetHandler.prepareToUndoDelete();