From cefdb2859930d20b624cac5400d49788a076078e Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Tue, 12 Dec 2023 15:21:49 -0600 Subject: [PATCH] Remove ENABLE_NO_LONG_PRESS_DRAG flag. Fix: 299748096 Flag: LEGACY ENABLE_NO_LONG_PRESS_DRAG ENABLED Test: atest TaplDragTest Change-Id: I6f14f2b048e111912fa0d1b8170ca702705e00bc --- src/com/android/launcher3/config/FeatureFlags.java | 4 ---- src/com/android/launcher3/dragndrop/DragController.java | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 2f62840679..65269d4920 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -201,10 +201,6 @@ public final class FeatureFlags { "ENABLE_PARAMETRIZE_REORDER", DISABLED, "Enables generating the reorder using a set of parameters"); - public static final BooleanFlag ENABLE_NO_LONG_PRESS_DRAG = getDebugFlag(299748096, - "ENABLE_NO_LONG_PRESS_DRAG", ENABLED, - "Don't trigger the drag if we are still under long press"); - // TODO(Block 12): Clean up flags public static final BooleanFlag ENABLE_MULTI_INSTANCE = getDebugFlag(270396680, "ENABLE_MULTI_INSTANCE", DISABLED, diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 777f4d5686..aa5329b8d7 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -17,7 +17,6 @@ package com.android.launcher3.dragndrop; import static com.android.launcher3.Utilities.ATLEAST_Q; -import static com.android.launcher3.config.FeatureFlags.ENABLE_NO_LONG_PRESS_DRAG; import android.graphics.Point; import android.graphics.Rect; @@ -464,7 +463,7 @@ public abstract class DragController private DropTarget checkTouchMove(final int x, final int y) { // If we are in predrag, don't trigger any other event until we get out of it - if (ENABLE_NO_LONG_PRESS_DRAG.get() && mIsInPreDrag) { + if (mIsInPreDrag) { return mLastDropTarget; } DropTarget dropTarget = findDropTarget(x, y);