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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15984295

Change-Id: I27f0b79b124de27454a156dd0ad0937ea853d3f3
This commit is contained in:
Brian Isganitis
2021-10-07 19:28:54 +00:00
committed by Automerger Merge Worker

View File

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