summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/EdgeEffect.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java
index c203c7903256..05c00471ee57 100644
--- a/core/java/android/widget/EdgeEffect.java
+++ b/core/java/android/widget/EdgeEffect.java
@@ -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))
);
}