aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Settling scrolls over clear-all button.

Browse Source 
Per UX feedback, we divide the "overscroll area" 50/50 and settle to the
closest of the most recent task position and the fully scrolled
position.

Bug: 72222505
Test: Manual
Change-Id: Ic98fa5ae2f14f274f6a425ac687f13f7b3a4332e
This commit is contained in:
Vadim Tryshev
2018-05-01 19:22:37 -07:00
parent cacf90cc48
commit a9283beebc
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/PagedView.java
View File

@@ -1171,11 +1171,19 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
mNextPage = getPageNearestToCenterOfScreen(unscaledScrollX);
int firstPageScroll = getScrollForPage(!mIsRtl ? 0 : getPageCount() - 1);
int lastPageScroll = getScrollForPage(!mIsRtl ? getPageCount() - 1 : 0);
if (mSettleOnPageInFreeScroll && unscaledScrollX > firstPageScroll
&& unscaledScrollX < lastPageScroll) {
// Make sure we land directly on a page. If flinging past one of the ends,
// don't change the velocity as it will get stopped at the end anyway.
mScroller.setFinalX((int) (getScrollForPage(mNextPage) * getScaleX()));
if (mSettleOnPageInFreeScroll && unscaledScrollX > 0
&& unscaledScrollX < mMaxScrollX) {
// If scrolling ends in the half of the added space that is closer to the
// end, settle to the end. Otherwise snap to the nearest page.
// If flinging past one of the ends, don't change the velocity as it will
// get stopped at the end anyway.
final int finalX = unscaledScrollX < firstPageScroll / 2 ?
0 :
unscaledScrollX > (lastPageScroll + mMaxScrollX) / 2 ?
mMaxScrollX :
getScrollForPage(mNextPage);
mScroller.setFinalX((int) (finalX * getScaleX()));
// Ensure the scroll/snap doesn't happen too fast;
int extraScrollDuration = OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION
- mScroller.getDuration();