Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93bb98e authored by Sebastián Franco's avatar Sebastián Franco Committed by Android (Google) Code Review
Browse files

Merge "Remove ENABLE_NO_LONG_PRESS_DRAG flag." into main

parents b7a5eb9e cefdb285

src/com/android/launcher3/config/FeatureFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -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,

src/com/android/launcher3/dragndrop/DragController.java

+1 −2
Original line number Diff line number Diff line
@@ -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<T extends ActivityContext> 


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