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

Commit 7ad6cb87 authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

Merge "Updated EdgeEffect stretch distance" into sc-dev am: 4f901f60

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13880001

Change-Id: Ifc50bef1570863f3fee513aaffcae50694caeb96
parents ba8ef283 4f901f60
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class EdgeEffect {
    private long mStartTime;
    private float mDuration;
    private float mStretchIntensity = DEFAULT_MAX_STRETCH_INTENSITY;
    private float mStretchDistanceFraction = 0.1f;
    private float mStretchDistanceFraction = 1f;
    private float mStretchDistance = -1f;

    private final Interpolator mInterpolator = new DecelerateInterpolator();
@@ -656,7 +656,7 @@ public class EdgeEffect {
                    //  for now leverage placeholder logic if no stretch distance is provided to
                    //  consume the displacement ratio times the minimum of the width or height
                    mStretchDistance > 0 ? mStretchDistance :
                            (mStretchDistanceFraction * Math.min(mWidth, mHeight))
                            (mStretchDistanceFraction * Math.max(mWidth, mHeight))
            );
        }