commit 990c95f104c01a2f3417e48ac51b58d989d0f21b
author Yorke Lee <yorkelee@google.com> Sat Sep 28 00:07:39 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 28 00:07:40 2013 +0000
tree c169f9568f55666460ed1daa0d80be814da4c091
parent 392b69c3c3a695b77af528dd17c6a7cc6e4866f8
parent 3ed80a357d780310777178ad589d7771d4f7bf2d

Merge "Fix relayout requests when dragging" into klp-dev

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 39bc8ae..10b9e9a 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.
      */