aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add remove system shortcut to folder items" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-06-07 14:08:44 -07:00
committed by Android (Google) Code Review
parent bcb814268c ffd3ced53f
commit fb0f2ff41d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
View File

@@ -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);

3
src/com/android/launcher3/popup/SystemShortcut.java
View File

@@ -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();