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

Unverified Commit 8fe17eed authored by LuK1337's avatar LuK1337
Browse files

fixup! Trebuchet: allow disabling workspace edit 

Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/8628
Change-Id: I1c1e5be28b10adf491a6cf694695670ab9604271
parent 3f17c3bf

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

+0 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.app.animation.Interpolators; 
import com.android.launcher3.DragSource;

import com.android.launcher3.DropTarget;

import com.android.launcher3.Flags;

import com.android.launcher3.Utilities;

import com.android.launcher3.logging.InstanceId;

import com.android.launcher3.model.data.AppPairInfo;

import com.android.launcher3.model.data.ItemInfo;
@@ -411,11 +410,6 @@ public abstract class DragController<T extends ActivityContext> 
            return false;

        }



        if (!Utilities.isWorkspaceEditAllowed(mActivity.getDragLayer().getContext())) {

            cancelDrag();

            return false;

        }



        Point dragLayerPos = getClampedDragLayerPos(getX(ev), getY(ev));

        mLastTouch.set(dragLayerPos.x,  dragLayerPos.y);

        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.res.Resources; 
import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.view.HapticFeedbackConstants;

import android.view.MotionEvent;

import android.view.View;



import androidx.annotation.Nullable;
@@ -35,6 +36,7 @@ import com.android.launcher3.DragSource; 
import com.android.launcher3.DropTarget;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.accessibility.DragViewStateAnnouncer;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.widget.util.WidgetDragScaleUtils;
@@ -218,4 +220,13 @@ public class LauncherDragController extends DragController<Launcher> { 
                dropCoordinates);

        return mActivity.getWorkspace();

    }



    @Override

    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {

        if (!Utilities.isWorkspaceEditAllowed(mActivity.getDragLayer().getContext())) {

            cancelDrag();

            return false;

        }

        return super.onControllerInterceptTouchEvent(ev);

    }

}