Merge "Reset fast scroller when All Apps resets." into tm-qpr-dev

This commit is contained in:
Andy Wickham
2023-02-17 23:57:56 +00:00
committed by Android (Google) Code Review
2 changed files with 17 additions and 9 deletions
@@ -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);
}
@@ -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;