Snap for 6694650 from cfeb7627b760ff0caf4c0f2746657bcbec54b2ed to rvc-qpr1-release (76301de6) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3134,6 +3134,7 @@ public class ChooserActivity extends ResolverActivity implements
		// ends up disabled. That's because at some point the old tab's vertical scrolling is
		// disabled and the new tab's is enabled. For context, see b/159997845
		setVerticalScrollEnabled(true);
		mResolverDrawerLayout.scrollNestedScrollableChildBackToTop();
		}

		@Override

+12 −5

Original line number	Diff line number	Diff line
		@@ -464,11 +464,7 @@ public class ResolverDrawerLayout extends ViewGroup {
		smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, yvel);
		mDismissOnScrollerFinished = true;
		} else {
		if (isNestedListChildScrolled()) {
		mNestedListChild.smoothScrollToPosition(0);
		} else if (isNestedRecyclerChildScrolled()) {
		mNestedRecyclerChild.smoothScrollToPosition(0);
		}
		scrollNestedScrollableChildBackToTop();
		smoothScrollTo(yvel < 0 ? 0 : mCollapsibleHeight, yvel);
		}
		}
		@@ -493,6 +489,17 @@ public class ResolverDrawerLayout extends ViewGroup {
		return handled;
		}

		/**
		* Scroll nested scrollable child back to top if it has been scrolled.
		*/
		public void scrollNestedScrollableChildBackToTop() {
		if (isNestedListChildScrolled()) {
		mNestedListChild.smoothScrollToPosition(0);
		} else if (isNestedRecyclerChildScrolled()) {
		mNestedRecyclerChild.smoothScrollToPosition(0);
		}
		}

		private void onSecondaryPointerUp(MotionEvent ev) {
		final int pointerIndex = ev.getActionIndex();
		final int pointerId = ev.getPointerId(pointerIndex);