commit 63a10bcbce3d5db9604e697caf1072bc3323ae3c
author Yorke Lee <yorkelee@google.com> Mon Jul 07 16:39:52 2014 -0700
committer Yorke Lee <yorkelee@google.com> Mon Jul 07 16:39:52 2014 -0700
tree c7dff70e2a3a515eae153cea1c762120b6430d51
parent bc8877ba8e4984520f31f7bf0a297c664eb02fbb

Fix nested pre-scrolling delta magnitude

The framework bug causing a mis-signed delta was fixed, so
update the app-side workaround accordingly.

https://googleplex-android-review.git.corp.google.com/#/c/498315/

Change-Id: Id7272de056870a9272ac3d8bef8ab95c2275f74d

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

diff --git a/src/com/android/dialer/widget/OverlappingPaneLayout.java b/src/com/android/dialer/widget/OverlappingPaneLayout.java
index 0b11e88..b6b9ec7 100644
--- a/src/com/android/dialer/widget/OverlappingPaneLayout.java
+++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java
@@ -916,8 +916,8 @@
             Log.d(TAG, "onNestedPreScroll: " + dy);
         }
         mInNestedPreScrollDownwards =
-                mChildCannotConsumeScroll && dy > 0 && mSlideOffsetPx <= mIntermediateOffset;
-        mDragHelper.processNestedScroll(mSlideableView, 0, dy, consumed);
+                mChildCannotConsumeScroll && dy < 0 && mSlideOffsetPx <= mIntermediateOffset;
+        mDragHelper.processNestedScroll(mSlideableView, 0, -dy, consumed);
     }
 
     @Override
@@ -928,7 +928,6 @@
         }
         mChildCannotConsumeScroll = false;
         mInNestedPreScrollDownwards = false;
-        // We need to flip dyUnconsumed here, because its magnitude is reversed. b/14585990
         mDragHelper.processNestedScroll(mSlideableView, 0, -dyUnconsumed, null);
     }