diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-23 16:00:09 -0700 |
|---|---|---|
| committer | Nancy Chen <nancychen@google.com> | 2014-09-23 16:00:09 -0700 |
| commit | ce260ab8fc946cbe66023e2fa0a0e9cf3e915902 (patch) | |
| tree | 0b2b1891e9946b1c69ba77d3621d25d866e3f495 /src/com/android/dialer/list/PhoneFavoriteListView.java | |
| parent | f2d3bd5d0fc9fd8e28f440fce7489691e0aee46b (diff) | |
Drag and drop for PhoneFavoriteTileView but not when dialpad is open
Drag actions were disabled for PhoneFavoriteTileView when fixing a bug
that caused dragging when the dialpad was up. This CL restores the
original functionality while fixing the dialpad bug.
Bug: 17626737
Change-Id: I3a352088ff44c81230677d771479e367c9fe7856
Diffstat (limited to 'src/com/android/dialer/list/PhoneFavoriteListView.java')
| -rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteListView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java index 667681e01..ec31bd31f 100644 --- a/src/com/android/dialer/list/PhoneFavoriteListView.java +++ b/src/com/android/dialer/list/PhoneFavoriteListView.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Bitmap; import android.os.Handler; +import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.view.DragEvent; @@ -149,7 +150,7 @@ 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()) { + if (!PhoneFavoriteTileView.DRAG_PHONE_FAVORITE_TILE.equals(event.getLocalState())) { // Ignore any drag events that were not propagated by long pressing // on a {@link PhoneFavoriteTileView} return false; |