Merge "Reset fast scroller when All Apps resets." into tm-qpr-dev (5969e052) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
		mAH.get(i).mRecyclerView.scrollToTop();
		}
		}
		if (mTouchHandler != null) {
		mTouchHandler.endFastScrolling();
		}
		if (mHeader != null && mHeader.getVisibility() == VISIBLE) {
		mHeader.reset(animate);
		}

+14 −9

Original line number	Diff line number	Diff line
		@@ -283,15 +283,7 @@ public class RecyclerViewFastScroller extends View {
		break;
		case MotionEvent.ACTION_UP:
		case MotionEvent.ACTION_CANCEL:
		mRv.onFastScrollCompleted();
		mTouchOffsetY = 0;
		mLastTouchY = 0;
		mIgnoreDragGesture = false;
		if (mIsDragging) {
		mIsDragging = false;
		animatePopupVisibility(false);
		showActiveScrollbar(false);
		}
		endFastScrolling();
		break;
		}
		if (DEBUG) {
		@@ -330,6 +322,19 @@ public class RecyclerViewFastScroller extends View {
		setThumbOffsetY((int) mLastTouchY);
		}

		/** End any active fast scrolling touch handling, if applicable. */
		public void endFastScrolling() {
		mRv.onFastScrollCompleted();
		mTouchOffsetY = 0;
		mLastTouchY = 0;
		mIgnoreDragGesture = false;
		if (mIsDragging) {
		mIsDragging = false;
		animatePopupVisibility(false);
		showActiveScrollbar(false);
		}
		}

		public void onDraw(Canvas canvas) {
		if (mThumbOffsetY < 0) {
		return;