commit 2aef617f4afac074288818f6a63238fb836df361
author Brian Attwell <brianattwell@google.com> Wed Oct 01 22:39:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 01 22:39:16 2014 +0000
tree 4fc2ecb476bbf7f6606bd37dbbcc9dca58156715
parent 4b02d39933c743695bd875782e4d052988ab0171
parent bb8cc37eade1b1906e94171476e4a6420ba156d4

am bb8cc37e: Merge "Don\'t forget header momentum upon scroll events" into lmp-dev

* commit 'bb8cc37eade1b1906e94171476e4a6420ba156d4':
  Don't forget header momentum upon scroll events

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 b817229..ad18b14 100644
--- a/src/com/android/dialer/widget/OverlappingPaneLayout.java
+++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java
@@ -988,7 +988,7 @@
         if (DEBUG) {
             Log.d(TAG, "onStopNestedScroll");
         }
-        if (mIsInNestedScroll) {
+        if (mIsInNestedScroll && !mIsInNestedFling) {
             mDragHelper.stopNestedScroll(mSlideableView);
             mInNestedPreScrollDownwards = false;
             mInNestedPreScrollUpwards = false;
@@ -1024,7 +1024,8 @@
                 }
             }
 
-            if (mDragHelper.getVelocityMagnitude() > 0
+            if (state == ViewDragHelper.STATE_IDLE
+                    && mDragHelper.getVelocityMagnitude() > 0
                     && (mDragHelper.getCurrentScrollY() == 0
                     || mDragHelper.getCurrentScrollY() == mIntermediateOffset)
                     && mIsInNestedFling) {
@@ -1099,6 +1100,7 @@
         public void onViewReleased(View releasedChild, float xvel, float yvel) {
             if (DEBUG) {
                 Log.d(TAG, "onViewReleased: "
+                        + " mIsInNestedFling=" + mIsInNestedFling
                         + " unscrolled=" + mPanelSlideCallbacks.isScrollableChildUnscrolled()
                         + ", mInNestedPreScrollDownwards = " + mInNestedPreScrollDownwards
                         + ", mInNestedPreScrollUpwards = " + mInNestedPreScrollUpwards