diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-09-17 17:44:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-17 17:44:16 +0000 |
| commit | 8ec377d8d6d71000466b9265c799f3ea153c783c (patch) | |
| tree | 3b327a2a8050eed8d58337f9eb045eae6a0949ec | |
| parent | 6b0803575d047d405caf98d92511a2974c3b2338 (diff) | |
| parent | a239d7b867679106aec1a8f0c52fbd358d25e891 (diff) | |
Merge "Don't double scroll listview in Dialer" into lmp-dev
| -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; } } |