diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-09 23:26:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-09 23:26:01 +0000 |
| commit | 788003e4bf3fb0faf95664936f8f43bc8f0fcf92 (patch) | |
| tree | 6882f894e8c5556b5868b631de5f99b689a7a75b /src | |
| parent | 7a4dfc9885c12a4a999d43622493abda8c620e73 (diff) | |
| parent | 6c4fa1045bae7574ccea8e8c9a52cbcb19f3eef7 (diff) | |
| download | android_packages_apps_Trebuchet-788003e4bf3fb0faf95664936f8f43bc8f0fcf92.tar.gz android_packages_apps_Trebuchet-788003e4bf3fb0faf95664936f8f43bc8f0fcf92.tar.bz2 android_packages_apps_Trebuchet-788003e4bf3fb0faf95664936f8f43bc8f0fcf92.zip | |
Merge "Tune discovery bounce to be more gentle when bouncing." into ub-launcher3-edmonton
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/DiscoveryBounce.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java index 8f1c8dfd8..e8c5f15df 100644 --- a/src/com/android/launcher3/allapps/DiscoveryBounce.java +++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java @@ -156,14 +156,14 @@ public class DiscoveryBounce extends AbstractFloatingView { float verticalProgress = OVERVIEW.getVerticalProgress(launcher); TimeInterpolator pathInterpolator = new PathInterpolator(0.35f, 0, 0.5f, 1); - Keyframe keyframe3 = Keyframe.ofFloat(0.423f, verticalProgress - (1 - 0.9438f)); + Keyframe keyframe3 = Keyframe.ofFloat(0.423f, verticalProgress - (1 - 0.9738f)); keyframe3.setInterpolator(pathInterpolator); - Keyframe keyframe4 = Keyframe.ofFloat(0.654f, verticalProgress); + Keyframe keyframe4 = Keyframe.ofFloat(0.754f, verticalProgress); keyframe4.setInterpolator(pathInterpolator); PropertyValuesHolder propertyValuesHolder = PropertyValuesHolder.ofKeyframe("progress", Keyframe.ofFloat(0, verticalProgress), - Keyframe.ofFloat(0.346f, verticalProgress), keyframe3, keyframe4, + Keyframe.ofFloat(0.246f, verticalProgress), keyframe3, keyframe4, Keyframe.ofFloat(1f, verticalProgress)); ObjectAnimator animator = ObjectAnimator.ofPropertyValuesHolder(null, new PropertyValuesHolder[]{propertyValuesHolder}); |