diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-10-01 14:23:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 14:23:33 +0000 |
| commit | 19518d2db02f4e6a4f7f32dfd969864ff0f55114 (patch) | |
| tree | 13936ec98c0caffc386a6d3ad406d2ecd370ec76 /src | |
| parent | 851a5e4796724bb2fde24dc5cb868cc9c7c05c40 (diff) | |
| parent | 090ccc50ee6d6895db77ffc4afcf7dd66f30597a (diff) | |
Merge "Fix flicker when long pressing to drag and drop" into klp-dev
Diffstat (limited to 'src')
3 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteListView.java b/src/com/android/dialer/list/PhoneFavoriteListView.java index 10b9e9a96..b685e8231 100644 --- a/src/com/android/dialer/list/PhoneFavoriteListView.java +++ b/src/com/android/dialer/list/PhoneFavoriteListView.java @@ -306,14 +306,6 @@ public class PhoneFavoriteListView extends ListView implements SwipeHelperCallba } } - private FrameLayout.LayoutParams getDragShadowLayoutParams() { - final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams( - mDragShadowWidth, mDragShadowHeight); - lp.leftMargin = mDragShadowLeft; - lp.topMargin = mDragShadowTop; - return lp; - } - /** * @return True if the drag is started. */ @@ -361,7 +353,8 @@ public class PhoneFavoriteListView extends ListView implements SwipeHelperCallba mDragShadowOverlay.setVisibility(VISIBLE); mDragShadowOverlay.setAlpha(DRAG_SHADOW_ALPHA); - mDragShadowOverlay.setLayoutParams(getDragShadowLayoutParams()); + mDragShadowOverlay.setX(mDragShadowLeft); + mDragShadowOverlay.setY(mDragShadowTop); // x and y passed in are the coordinates of where the user has touched down, calculate // the offset to the top left coordinate of the dragged child. This will be used for diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java index 765745172..ac89fd693 100644 --- a/src/com/android/dialer/list/PhoneFavoriteTileView.java +++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java @@ -96,7 +96,6 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { setOnLongClickListener(new OnLongClickListener() { @Override public boolean onLongClick(View v) { - setPressed(false); final PhoneFavoriteTileView view = (PhoneFavoriteTileView) v; // NOTE The drag shadow is handled in the ListView. if (view instanceof PhoneFavoriteRegularRowView) { diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java index ce18a2b87..a4a2cb418 100644 --- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java @@ -772,7 +772,6 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements setVisibility(View.VISIBLE); } } - setPressed(false); } private void addTileFromEntry(ContactEntry entry, int childIndex, boolean isLastRow) { |