From 3a3aa518f91b051c2a31acf3cc41ef9ca9302ec2 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Fri, 6 Oct 2023 15:10:05 -0700 Subject: [PATCH] Prevent workspace app icons/widgets from handling long click in split selection Bug: 295981634 Test: Enter split selection on workspace, long pressing on app icon or widget does nothing Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE Change-Id: Ib439249477a7bb8bbbda9fd42e08ab02af7a831b --- src/com/android/launcher3/touch/ItemLongClickListener.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/launcher3/touch/ItemLongClickListener.java b/src/com/android/launcher3/touch/ItemLongClickListener.java index 122b1e0d7e..a09e5a4794 100644 --- a/src/com/android/launcher3/touch/ItemLongClickListener.java +++ b/src/com/android/launcher3/touch/ItemLongClickListener.java @@ -30,6 +30,7 @@ import android.view.View.OnLongClickListener; import com.android.launcher3.CellLayout; import com.android.launcher3.DropTarget; import com.android.launcher3.Launcher; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.folder.Folder; @@ -136,6 +137,9 @@ public class ItemLongClickListener { if (launcher.isWorkspaceLocked()) return false; // Return early if an item is already being dragged (e.g. when long-pressing two shortcuts) if (launcher.getDragController().isDragging()) return false; + // Return early if user is in the middle of selecting split-screen apps + if (FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get() && + launcher.isSplitSelectionEnabled()) return false; return true; }