diff options
| author | Nader Jawad <njawad@google.com> | 2021-04-13 22:11:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-13 22:11:11 +0000 |
| commit | e178f5035616af9df31c339161c16b39d4bf2bdf (patch) | |
| tree | 32d01fd2a607ee450694fab43d472e938e484275 /core/java | |
| parent | b7f09b1c5ce57fbc7ffc7daa7d287ab6ec70d080 (diff) | |
| parent | 9ed86141f2d63025116e30381f50406c4f2d32a2 (diff) | |
Merge "Adjusted interpolation and stretch intensity" into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/EdgeEffect.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 50fca043d4e0..cd91d0266c75 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -130,9 +130,9 @@ public class EdgeEffect { public @interface EdgeEffectType { } - private static final float LINEAR_STRETCH_INTENSITY = 0.06f; + private static final float LINEAR_STRETCH_INTENSITY = 0.016f; - private static final float EXP_STRETCH_INTENSITY = 0.06f; + private static final float EXP_STRETCH_INTENSITY = 0.016f; private static final float SCROLL_DIST_AFFECTED_BY_EXP_STRETCH = 0.33f; |