commit ddf53180e47cd4d31ba6bc762e98670898b040c9
author Christopher Wiley <wiley@google.com> Mon Sep 14 14:11:19 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 14 14:11:19 2015 +0000
tree 5dc0b093223304b3c6342036f41feb4e51fbd605
parent 4140a21e2ec69089de916e240fd606a3daf09896
parent 73ea1230fc2a4007973efe3730d482d7bc6cf87a

Merge "Remove the aidl tool"

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 6dcbed6..09c5644 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -1925,6 +1925,7 @@
 
             case MotionEvent.ACTION_DOWN: {
                 final int y = (int) ev.getY();
+                mScrolledToTopOnFirstDown = isScrolledToTop();
                 if (getChildAtPosition(ev.getX(), y) == null) {
                     setIsBeingDragged(false);
                     recycleVelocityTracker();
@@ -1938,7 +1939,6 @@
                 mLastMotionY = y;
                 mDownX = (int) ev.getX();
                 mActivePointerId = ev.getPointerId(0);
-                mScrolledToTopOnFirstDown = isScrolledToTop();
 
                 initOrResetVelocityTracker();
                 mVelocityTracker.addMovement(ev);