Merge "Fix drag events transfering through dialpad" into lmp-dev

2 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java
index 4ecc1cd90..667681e01 100644
--- a/src/com/android/dialer/list/PhoneFavoriteListView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteListView.java
@@ -149,6 +149,11 @@ public class PhoneFavoriteListView extends GridView implements OnDragDropListene
         final int eY = (int) event.getY();
         switch (action) {
             case DragEvent.ACTION_DRAG_STARTED: {
+                if (PhoneFavoriteTileView.EMPTY_CLIP_DATA != event.getClipData()) {
+                    // Ignore any drag events that were not propagated by long pressing
+                    // on a {@link PhoneFavoriteTileView}
+                    return false;
+                }
                 if (!mDragDropController.handleDragStarted(eX, eY)) {
                     return false;
                 }
diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index 208e3507d..2aedd9479 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -56,7 +56,7 @@ public abstract class PhoneFavoriteTileView extends ContactTileView {
 
     // Dummy clip data object that is attached to drag shadows so that text views
     // don't crash with an NPE if the drag shadow is released in their bounds
-    private static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");
+    static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");
 
     public PhoneFavoriteTileView(Context context, AttributeSet attrs) {
         super(context, attrs);