commit c32c359ac225ff55dc4f69158dc2d99308eaeffd
author Yorke Lee <yorkelee@google.com> Wed Sep 17 18:11:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 17 18:11:15 2014 +0000
tree 9e3ec6189c54d2d1283a9dcbe91b45d88646149f
parent 8ec377d8d6d71000466b9265c799f3ea153c783c
parent 1f26c7b23999e9b8e6fe86bca96d0390ef126b8d

Merge "Fix activity leak in Dialer" into lmp-dev

src/com/android/dialer/widget/ViewDragHelper.java

diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java
index 3d55ad4..91016d1 100644
--- a/src/com/android/dialer/widget/ViewDragHelper.java
+++ b/src/com/android/dialer/widget/ViewDragHelper.java
@@ -1487,8 +1487,8 @@
         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;
         }
     }