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

+14 −9

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