Bug 844526 - Reset touch/scroll state on ACTION_UP while in overscroll in TwoWayView (r=mfinkle)
authorLucas Rocha <lucasr@mozilla.com>
Tue, 12 Mar 2013 13:47:48 +0000
changeset 124492 29f9c2b3c4ae7da93a77b12cad2321b085149e59
parent 124491 397034d19dfcb8ddc9a5b1e242b1e596228078f6
child 124493 71190bec18a7a06cc52c8a4a6622fbc4a5f0e7d0
push id24420
push userryanvm@gmail.com
push dateTue, 12 Mar 2013 19:35:31 +0000
treeherdermozilla-central@79b8e0a0bdb7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs844526
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 844526 - Reset touch/scroll state on ACTION_UP while in overscroll in TwoWayView (r=mfinkle)
mobile/android/base/widget/TwoWayView.java
--- a/mobile/android/base/widget/TwoWayView.java
+++ b/mobile/android/base/widget/TwoWayView.java
@@ -1448,16 +1448,20 @@ public class TwoWayView extends AdapterV
                     mLastTouchPos = 0;
                     needsInvalidate = true;
                 } else {
                     mTouchMode = TOUCH_MODE_REST;
                     reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
                 }
 
                 break;
+
+            case TOUCH_MODE_OVERSCROLL:
+                mTouchMode = TOUCH_MODE_REST;
+                reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
             }
 
             cancelCheckForTap();
             cancelCheckForLongPress();
             setPressed(false);
 
             if (mStartEdge != null && mEndEdge != null) {
                 needsInvalidate |= mStartEdge.onRelease() | mEndEdge.onRelease();