diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-10-01 22:16:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 22:16:59 +0000 |
| commit | bb8cc37eade1b1906e94171476e4a6420ba156d4 (patch) | |
| tree | 1a295e484199445f2ca6beb115ed002b1c94cc92 | |
| parent | f650cef924f24a4e22fc9ac187ecf4124b1001b4 (diff) | |
| parent | 7355a4e1a7d03715451501f43ae06b1597ea597d (diff) | |
Merge "Don't forget header momentum upon scroll events" into lmp-dev
| -rw-r--r-- | src/com/android/dialer/widget/OverlappingPaneLayout.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/dialer/widget/OverlappingPaneLayout.java b/src/com/android/dialer/widget/OverlappingPaneLayout.java index b81722942..ad18b1486 100644 --- a/src/com/android/dialer/widget/OverlappingPaneLayout.java +++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java @@ -988,7 +988,7 @@ public class OverlappingPaneLayout extends ViewGroup { if (DEBUG) { Log.d(TAG, "onStopNestedScroll"); } - if (mIsInNestedScroll) { + if (mIsInNestedScroll && !mIsInNestedFling) { mDragHelper.stopNestedScroll(mSlideableView); mInNestedPreScrollDownwards = false; mInNestedPreScrollUpwards = false; @@ -1024,7 +1024,8 @@ public class OverlappingPaneLayout extends ViewGroup { } } - if (mDragHelper.getVelocityMagnitude() > 0 + if (state == ViewDragHelper.STATE_IDLE + && mDragHelper.getVelocityMagnitude() > 0 && (mDragHelper.getCurrentScrollY() == 0 || mDragHelper.getCurrentScrollY() == mIntermediateOffset) && mIsInNestedFling) { @@ -1099,6 +1100,7 @@ public class OverlappingPaneLayout extends ViewGroup { public void onViewReleased(View releasedChild, float xvel, float yvel) { if (DEBUG) { Log.d(TAG, "onViewReleased: " + + " mIsInNestedFling=" + mIsInNestedFling + " unscrolled=" + mPanelSlideCallbacks.isScrollableChildUnscrolled() + ", mInNestedPreScrollDownwards = " + mInNestedPreScrollDownwards + ", mInNestedPreScrollUpwards = " + mInNestedPreScrollUpwards |