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

Merge "Fix Sharesheet nest scrolling issue introduced by using RecyclerView" into rvc-dev

Browse Source
This commit is contained in:
Zhen Zhang
2020-03-06 17:22:11 +00:00
committed by Android (Google) Code Review
parent 24a1ea3f03 dc9047c513
commit 973ec1172b
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,8 @@ public class ResolverDrawerLayout extends ViewGroup {
private final Rect mTempRect = new Rect();
private AbsListView mNestedScrollingChild;
private AbsListView mNestedListChild;
private RecyclerView mNestedRecyclerChild;
private final ViewTreeObserver.OnTouchModeChangeListener mTouchModeChangeListener =
new ViewTreeObserver.OnTouchModeChangeListener() {
@@ -347,11 +348,20 @@ public class ResolverDrawerLayout extends ViewGroup {
return mIsDragging || mOpenOnClick;
}
private boolean isNestedChildScrolled() {
return mNestedScrollingChild != null
&& mNestedScrollingChild.getChildCount() > 0
&& (mNestedScrollingChild.getFirstVisiblePosition() > 0
|| mNestedScrollingChild.getChildAt(0).getTop() < 0);
private boolean isNestedListChildScrolled() {
return mNestedListChild != null
&& mNestedListChild.getChildCount() > 0
&& (mNestedListChild.getFirstVisiblePosition() > 0
|| mNestedListChild.getChildAt(0).getTop() < 0);
}
private boolean isNestedRecyclerChildScrolled() {
if (mNestedRecyclerChild != null && mNestedRecyclerChild.getChildCount() > 0) {
final RecyclerView.ViewHolder vh =
mNestedRecyclerChild.findViewHolderForAdapterPosition(0);
return vh == null || vh.itemView.getTop() < 0;
}
return false;
}
@Override
@@ -396,8 +406,10 @@ public class ResolverDrawerLayout extends ViewGroup {
}
if (mIsDragging) {
final float dy = y - mLastTouchY;
if (dy > 0 && isNestedChildScrolled()) {
mNestedScrollingChild.smoothScrollBy((int) -dy, 0);
if (dy > 0 && isNestedListChildScrolled()) {
mNestedListChild.smoothScrollBy((int) -dy, 0);
} else if (dy > 0 && isNestedRecyclerChildScrolled()) {
mNestedRecyclerChild.scrollBy(0, (int) -dy);
} else {
performDrag(dy);
}
@@ -452,8 +464,10 @@ public class ResolverDrawerLayout extends ViewGroup {
smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, yvel);
mDismissOnScrollerFinished = true;
} else {
if (isNestedChildScrolled()) {
mNestedScrollingChild.smoothScrollToPosition(0);
if (isNestedListChildScrolled()) {
mNestedListChild.smoothScrollToPosition(0);
} else if (isNestedRecyclerChildScrolled()) {
mNestedRecyclerChild.smoothScrollToPosition(0);
}
smoothScrollTo(yvel < 0 ? 0 : mCollapsibleHeight, yvel);
}
@@ -729,8 +743,11 @@ public class ResolverDrawerLayout extends ViewGroup {
@Override
public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
if ((nestedScrollAxes & View.SCROLL_AXIS_VERTICAL) != 0) {
if (child instanceof AbsListView) {
mNestedScrollingChild = (AbsListView) child;
if (target instanceof AbsListView) {
mNestedListChild = (AbsListView) target;
}
if (target instanceof RecyclerView) {
mNestedRecyclerChild = (RecyclerView) target;
}
return true;
}