diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-09-17 17:52:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 17:52:17 +0000 |
| commit | 351709ede3134c286548fae58ba00da4a8b518ce (patch) | |
| tree | e51073910337ca50679312156f3e0db367e74b32 | |
| parent | f187c51b03f5dc59e207d228e712890fffdc7d8c (diff) | |
| parent | 8ec377d8d6d71000466b9265c799f3ea153c783c (diff) | |
am 8ec377d8: Merge "Don\'t double scroll listview in Dialer" into lmp-dev
* commit '8ec377d8d6d71000466b9265c799f3ea153c783c':
Don't double scroll listview in Dialer
| -rw-r--r-- | src/com/android/dialer/widget/ViewDragHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java index 3d55ad47c..91016d15b 100644 --- a/src/com/android/dialer/widget/ViewDragHelper.java +++ b/src/com/android/dialer/widget/ViewDragHelper.java @@ -1487,8 +1487,8 @@ public class ViewDragHelper { if (consumed != null) { final int unconsumedX = targetX - mCapturedView.getLeft(); final int unconsumedY = targetY - mCapturedView.getTop(); - consumed[0] = dx - unconsumedX; - consumed[1] = dy - unconsumedY; + consumed[0] = unconsumedX - dx; + consumed[1] = unconsumedY - dy; } } |