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

Commit e3b26d01 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Have PopContainerWithArrow require BaseDraggingActivity." into sc-v2-dev

parents c220b9a2 6a1b0a58

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+1 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import com.android.launcher3.DragSource; 
import com.android.launcher3.DropTarget;

import com.android.launcher3.DropTarget.DragObject;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.accessibility.ShortcutMenuAccessibilityDelegate;
@@ -64,7 +63,6 @@ import com.android.launcher3.notification.NotificationKeyData; 
import com.android.launcher3.popup.PopupDataProvider.PopupDataChangeListener;

import com.android.launcher3.shortcuts.DeepShortcutView;

import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.touch.ItemLongClickListener;

import com.android.launcher3.util.PackageUserKey;

import com.android.launcher3.util.ShortcutUtil;
@@ -83,7 +81,7 @@ import java.util.stream.Collectors; 
 *

 * @param <T> The activity on with the popup shows

 */

public class PopupContainerWithArrow<T extends StatefulActivity<LauncherState>>

public class PopupContainerWithArrow<T extends BaseDraggingActivity>

        extends ArrowPopup<T> implements DragSource, DragController.DragListener {



    private final List<DeepShortcutView> mShortcuts = new ArrayList<>();