From ffd3ced53f23c2ad528c9f93456071b69a7c6a1e Mon Sep 17 00:00:00 2001 From: Federico Baron Date: Thu, 5 Jun 2025 18:44:59 +0000 Subject: [PATCH] Add remove system shortcut to folder items Bug: 419289205 Test: NexusLauncherImageTests Flag: com.android.launcher3.enable_long_press_remove_shortcut Change-Id: I4bba230d13696d8d9dc02e232f8a302ae9e893e0 --- .../com/android/launcher3/uioverrides/QuickstepLauncher.java | 3 ++- src/com/android/launcher3/popup/SystemShortcut.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 13322b025d..9ff3b225f9 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -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); diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java index 9fefb9484a..52248c4991 100644 --- a/src/com/android/launcher3/popup/SystemShortcut.java +++ b/src/com/android/launcher3/popup/SystemShortcut.java @@ -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 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();