From 63a10bcbce3d5db9604e697caf1072bc3323ae3c Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Mon, 7 Jul 2014 16:39:52 -0700 Subject: 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/dialer/widget/OverlappingPaneLayout.java b/src/com/android/dialer/widget/OverlappingPaneLayout.java index 0b11e8863..b6b9ec777 100644 --- a/src/com/android/dialer/widget/OverlappingPaneLayout.java +++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java @@ -916,8 +916,8 @@ public class OverlappingPaneLayout extends ViewGroup { 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 @@ public class OverlappingPaneLayout extends ViewGroup { } mChildCannotConsumeScroll = false; mInNestedPreScrollDownwards = false; - // We need to flip dyUnconsumed here, because its magnitude is reversed. b/14585990 mDragHelper.processNestedScroll(mSlideableView, 0, -dyUnconsumed, null); } -- cgit v1.2.3