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

Commit f2dcb390 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev

parents 5cfea842 6c5c48a8
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -45,10 +45,9 @@ public class SwipeDismissLayout extends FrameLayout {
        /**
         * Called when the layout has been swiped and the position of the window should change.
         *
         * @param progress A number in [-1, 1] representing how far to the left
         * or right the window has been swiped. Negative values are swipes
         * left, and positives are right.
         * @param translate A number in [-w, w], where w is the width of the
         * @param progress A number in [0, 1] representing how far to the
         * right the window has been swiped
         * @param translate A number in [0, w], where w is the width of the
         * layout. This is equivalent to progress * layout.getWidth().
         */
        void onSwipeProgressChanged(SwipeDismissLayout layout, float progress, float translate);
@@ -207,7 +206,7 @@ public class SwipeDismissLayout extends FrameLayout {

    private void setProgress(float deltaX) {
        mTranslationX = deltaX;
        if (mProgressListener != null) {
        if (mProgressListener != null && deltaX >= 0)  {
            mProgressListener.onSwipeProgressChanged(this, deltaX / getWidth(), deltaX);
        }
    }