Snap for 13614183 from fb0f2ff41d to 25Q3-release

Change-Id: Ie9a58a4a87eab89605836f95defe062f4d11ec03
This commit is contained in:
Android Build Coastguard Worker
2025-06-08 14:17:51 -07:00
2 changed files with 4 additions and 2 deletions
@@ -506,7 +506,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();