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

Commit c42c8e76 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Disable drag from taskbar while in desktop. 

Currently drag from taskbar is broken. It will be fixed once drag from
taskbar to desktop is implemented in b/297921594.

Bug: 323388149
Test: Try to drag an app from taskbar while in desktop, see that app is
not launch and icon goes back to it's place in taskbar.
Flag: NONE

Change-Id: I27e73d8262e14944b34e193397a83f8435813339
parent 8b0d1fb6

quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

+8 −1
Original line number Diff line number Diff line
@@ -74,12 +74,14 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; 
import com.android.launcher3.popup.PopupContainerWithArrow;

import com.android.launcher3.shortcuts.DeepShortcutView;

import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.IntSet;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.launcher3.views.BubbleTextHolder;

import com.android.quickstep.LauncherActivityInterface;

import com.android.quickstep.util.LogUtils;

import com.android.quickstep.util.MultiValueUpdateListener;

import com.android.systemui.shared.recents.model.Task;
@@ -340,8 +342,13 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
    @Override

    protected void callOnDragStart() {

        super.callOnDragStart();

        // TODO(297921594) clean it up when taskbar to desktop drag is implemented.

        DesktopVisibilityController desktopController =

                LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();



        // Pre-drag has ended, start the global system drag.

        if (mDisallowGlobalDrag) {

        if (mDisallowGlobalDrag || (desktopController != null

                && desktopController.areDesktopTasksVisible())) {

            AbstractFloatingView.closeAllOpenViewsExcept(mActivity, TYPE_TASKBAR_ALL_APPS);

            return;

        }