diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-28 00:06:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-28 00:06:08 +0000 |
| commit | 392b69c3c3a695b77af528dd17c6a7cc6e4866f8 (patch) | |
| tree | 214b314940bc2a12ce8d199f8e22dbc5d55ab1eb /src | |
| parent | 50c92e029f55d07f48fc23355109b5da8fe3a7eb (diff) | |
| parent | 52112414bcc95394e537185316168dcdc943544f (diff) | |
| download | android_packages_apps_Dialer-392b69c3c3a695b77af528dd17c6a7cc6e4866f8.tar.gz android_packages_apps_Dialer-392b69c3c3a695b77af528dd17c6a7cc6e4866f8.tar.bz2 android_packages_apps_Dialer-392b69c3c3a695b77af528dd17c6a7cc6e4866f8.zip | |
Merge "Disable drag and drop if the undo dialog for a favorite is showing" into klp-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteListView.java | 5 | ||||
| -rw-r--r-- | src/com/android/dialer/list/PhoneFavoritesTileAdapter.java | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java index 4e0b8ff0e..9160e3a9c 100644 --- a/src/com/android/dialer/list/PhoneFavoriteListView.java +++ b/src/com/android/dialer/list/PhoneFavoriteListView.java @@ -325,6 +325,11 @@ public class PhoneFavoriteListView extends ListView implements SwipeHelperCallba } 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 = diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java index ae9414a4a..ce18a2b87 100644 --- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java @@ -667,6 +667,10 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements mPotentialRemoveEntryIndex = -1; } + public boolean hasPotentialRemoveEntryIndex() { + return isIndexInBound(mPotentialRemoveEntryIndex); + } + /** * Clears all temporary variables at a new interaction. */ |