summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-07 16:39:52 -0700
committerYorke Lee <yorkelee@google.com>2014-07-07 16:39:52 -0700
commit63a10bcbce3d5db9604e697caf1072bc3323ae3c (patch)
treec7dff70e2a3a515eae153cea1c762120b6430d51 /src
parentbc8877ba8e4984520f31f7bf0a297c664eb02fbb (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/widget/OverlappingPaneLayout.java5
1 files changed, 2 insertions, 3 deletions
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);
}