Merge "Update colors in Dialer for GAR requirements" into lmp-dev
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 39efa51..7cc519f 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -226,6 +226,12 @@
}
@Override
+ public void onDestroy() {
+ mCallLogAdapter.stopRequestProcessing();
+ super.onDestroy();
+ }
+
+ @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View parentView = inflater.inflate(R.layout.lists_fragment, container, false);
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;
}
}