Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Scroll the hiding page to top on tab changed in sharesheet" into rvc-qpr-dev

Browse Source
This commit is contained in:
Zhen Zhang
2020-07-20 19:29:20 +00:00
committed by Android (Google) Code Review
parent a0315ad1a5 068ddf7b06
commit cfeb7627b7
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -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 // 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 // disabled and the new tab's is enabled. For context, see b/159997845
setVerticalScrollEnabled(true); setVerticalScrollEnabled(true);
mResolverDrawerLayout.scrollNestedScrollableChildBackToTop();
} }
@Override @Override

17
core/java/com/android/internal/widget/ResolverDrawerLayout.java
View File

@@ -464,11 +464,7 @@ public class ResolverDrawerLayout extends ViewGroup {
smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, yvel); smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, yvel);
mDismissOnScrollerFinished = true; mDismissOnScrollerFinished = true;
} else { } else {
if (isNestedListChildScrolled()) { scrollNestedScrollableChildBackToTop();
mNestedListChild.smoothScrollToPosition(0);
} else if (isNestedRecyclerChildScrolled()) {
mNestedRecyclerChild.smoothScrollToPosition(0);
}
smoothScrollTo(yvel < 0 ? 0 : mCollapsibleHeight, yvel); smoothScrollTo(yvel < 0 ? 0 : mCollapsibleHeight, yvel);
} }
} }
@@ -493,6 +489,17 @@ public class ResolverDrawerLayout extends ViewGroup {
return handled; 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) { private void onSecondaryPointerUp(MotionEvent ev) {
final int pointerIndex = ev.getActionIndex(); final int pointerIndex = ev.getActionIndex();
final int pointerId = ev.getPointerId(pointerIndex); final int pointerId = ev.getPointerId(pointerIndex);