Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76301de6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6694650 from cfeb7627 to rvc-qpr1-release

Change-Id: I48a6b3540e97485719fcbd2ca1c9bd7396a1f0f9
parents 8d68d670 cfeb7627
Loading
Loading
Loading
Loading
+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);