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

Commit 31ff98e1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only allow horizontal spring if page will change." into ub-launcher3-master

parents 4acdb3bc 9e19866e

src/com/android/launcher3/PagedView.java

+10 −11
Original line number Diff line number Diff line
@@ -42,29 +42,28 @@ import android.view.accessibility.AccessibilityNodeInfo; 
import android.view.animation.Interpolator;

import android.widget.ScrollView;



import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;

import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;

import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;

import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE;

import static com.android.launcher3.touch.PagedOrientationHandler.VIEW_SCROLL_BY;

import static com.android.launcher3.touch.PagedOrientationHandler.VIEW_SCROLL_TO;



import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.model.PagedViewOrientedState;

import com.android.launcher3.pageindicators.PageIndicator;

import com.android.launcher3.states.RotationHelper;

import com.android.launcher3.touch.PortraitPagedViewHandler;

import com.android.launcher3.touch.OverScroll;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.launcher3.touch.PagedOrientationHandler.ChildBounds;

import com.android.launcher3.touch.PortraitPagedViewHandler;

import com.android.launcher3.util.OverScroller;

import com.android.launcher3.util.Thunk;



import java.util.ArrayList;



import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;

import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;

import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;

import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE;

import static com.android.launcher3.touch.PagedOrientationHandler.VIEW_SCROLL_BY;

import static com.android.launcher3.touch.PagedOrientationHandler.VIEW_SCROLL_TO;



/**

 * An abstraction of the original Workspace which supports browsing through a

 * sequential list of "pages"
@@ -1515,7 +1514,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
        // interpolator at zero, ie. 5. We use 4 to make it a little slower.

        duration = 4 * Math.round(1000 * Math.abs(distance / velocity));



        if (QUICKSTEP_SPRINGS.get()) {

        if (QUICKSTEP_SPRINGS.get() && mCurrentPage != whichPage) {

            return snapToPage(whichPage, delta, duration, false, null,

                    velocity * Math.signum(delta), true);

        } else {