From 277a4f9d7839278562dcac311418027cbf7bd7c5 Mon Sep 17 00:00:00 2001
From: Shamali P <shamalip@google.com>
Date: Thu, 6 Jun 2024 20:19:52 +0000
Subject: [PATCH] Use just the preview for drag and drop in the standalone
 activity

Bug: N/A
Test: Manual
Flag: EXEMPT bugfix
Change-Id: I62c42b649e720826979123ae2ff6c5e238fe59dc
---
 .../src/com/android/launcher3/WidgetPickerActivity.java  | 9 +++++++--
 src/com/android/launcher3/widget/WidgetCell.java         | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java
index 23cb8e9baa..943c08c786 100644
--- a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java
+++ b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java
@@ -194,6 +194,11 @@ public class WidgetPickerActivity extends BaseActivity {
                 return false;
             }
 
+            View dragView = widgetCell.getDragAndDropView();
+            if (dragView == null) {
+                return false;
+            }
+
             ClipData clipData = new ClipData(
                     new ClipDescription(
                             /* label= */ "", // not displayed anywhere; so, set to empty.
@@ -209,9 +214,9 @@ public class WidgetPickerActivity extends BaseActivity {
                     .putExtra(EXTRA_IS_PENDING_WIDGET_DRAG, true));
 
             // DRAG_FLAG_GLOBAL permits dragging data beyond app window.
-            return view.startDragAndDrop(
+            return dragView.startDragAndDrop(
                     clipData,
-                    new View.DragShadowBuilder(view),
+                    new View.DragShadowBuilder(dragView),
                     /* myLocalState= */ null,
                     View.DRAG_FLAG_GLOBAL
             );
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 2bb485aafa..35372d3af5 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -372,6 +372,13 @@ public class WidgetCell extends LinearLayout {
         }
     }
 
+    /**
+     * Returns a view (holding the previews) that can be dragged and dropped.
+     */
+    public View getDragAndDropView() {
+        return mWidgetImageContainer;
+    }
+
     public WidgetImageView getWidgetView() {
         return mWidgetImage;
     }