Merge "Fling should only be allowed when touched the view from bottom of the list" into qt-dev (b58ee2a4) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -1102,9 +1102,6 @@ public class CarStatusBar extends StatusBar implements
		@Override
		public boolean onScroll(MotionEvent event1, MotionEvent event2, float distanceX,
		float distanceY) {
		if (!mNotificationListAtBottomAtTimeOfTouch && !mNotificationListAtBottom) {
		return false;
		}
		// should not clip while scroll to the bottom of the list.
		if (!mNotificationListAtBottomAtTimeOfTouch) {
		return false;
		@@ -1141,7 +1138,8 @@ public class CarStatusBar extends StatusBar implements
		@Override
		public boolean onFling(MotionEvent event1, MotionEvent event2,
		float velocityX, float velocityY) {
		if (!mNotificationListAtBottomAtTimeOfTouch && !mNotificationListAtBottom) {
		// should not fling if the touch does not start when view is at the bottom of the list.
		if (!mNotificationListAtBottomAtTimeOfTouch) {
		return false;
		}
		if (Math.abs(event1.getX() - event2.getX()) > SWIPE_MAX_OFF_PATH