commit 62c7defd74e83fed84e4729664c6b20de8ed5846
author Yorke Lee <yorkelee@google.com> Mon Sep 30 14:17:35 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 30 14:17:35 2013 -0700
tree 214b314940bc2a12ce8d199f8e22dbc5d55ab1eb
parent c501f75bb7cab266334ce5f7fca6b5e24b068bbe
parent 392b69c3c3a695b77af528dd17c6a7cc6e4866f8

am 392b69c3: Merge "Disable drag and drop if the undo dialog for a favorite is showing" into klp-dev

* commit '392b69c3c3a695b77af528dd17c6a7cc6e4866f8':
  Disable drag and drop if the undo dialog for a favorite is showing

src/com/android/dialer/list/PhoneFavoriteListView.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java
index 4e0b8ff..9160e3a 100644
--- a/src/com/android/dialer/list/PhoneFavoriteListView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteListView.java
@@ -325,6 +325,11 @@
         }
 
         final ContactTileRow tile = (ContactTileRow) child;
+
+        if (tile.getTileAdapter().hasPotentialRemoveEntryIndex()) {
+            return false;
+        }
+
         final int itemIndex = tile.getItemIndex(x, y);
         if (itemIndex != -1 && mOnDragDropListener != null) {
             final PhoneFavoriteTileView tileView =

src/com/android/dialer/list/PhoneFavoritesTileAdapter.java

diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index ae9414a..ce18a2b 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -667,6 +667,10 @@
         mPotentialRemoveEntryIndex = -1;
     }
 
+    public boolean hasPotentialRemoveEntryIndex() {
+        return isIndexInBound(mPotentialRemoveEntryIndex);
+    }
+
     /**
      * Clears all temporary variables at a new interaction.
      */