diff options
author | Tony Wickham <twickham@google.com> | 2016-07-15 17:23:07 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-07-19 13:58:51 -0700 |
commit | 8f58e61d02fcb0ca90a2803e76a8792ec2c1f99a (patch) | |
tree | 2cba823be7962a2100c62acf086784f69fcae0fc /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
parent | 1e3d490e08b06750d467e144e5d74ea420c59613 (diff) | |
download | android_packages_apps_Trebuchet-8f58e61d02fcb0ca90a2803e76a8792ec2c1f99a.tar.gz android_packages_apps_Trebuchet-8f58e61d02fcb0ca90a2803e76a8792ec2c1f99a.tar.bz2 android_packages_apps_Trebuchet-8f58e61d02fcb0ca90a2803e76a8792ec2c1f99a.zip |
Update shortcut animations.
- Open animation: shortcuts reveal using modified circular reveal
(so that it reveals in the pill shape instead of a circle);
slight translation away from the original icon; scale icon and text.
- Hover animation: scale the shortcut pill and translate others away.
Bug: 28980830
Bug: 30127368
Change-Id: I8ed05c7a082f2c2a3f6c663da7259f6cd33e394f
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index c3b7fe760..5c7e670a9 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -35,8 +35,8 @@ import android.view.animation.DecelerateInterpolator; import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.util.CircleRevealOutlineProvider; import com.android.launcher3.util.Thunk; -import com.android.launcher3.util.UiThreadCircularReveal; import com.android.launcher3.widget.WidgetsContainerView; import java.util.HashMap; @@ -345,8 +345,8 @@ public class LauncherStateTransitionAnimation { float startRadius = pCb.getMaterialRevealViewStartFinalRadius(); AnimatorListenerAdapter listener = pCb.getMaterialRevealViewAnimatorListener( revealView, buttonView); - Animator reveal = UiThreadCircularReveal.createCircularReveal(revealView, width / 2, - height / 2, startRadius, revealRadius); + Animator reveal = new CircleRevealOutlineProvider(width / 2, height / 2, + startRadius, revealRadius).createRevealAnimator(revealView); reveal.setDuration(revealDuration); reveal.setInterpolator(new LogDecelerateInterpolator(100, 0)); if (listener != null) { @@ -789,8 +789,8 @@ public class LauncherStateTransitionAnimation { float finalRadius = pCb.getMaterialRevealViewStartFinalRadius(); AnimatorListenerAdapter listener = pCb.getMaterialRevealViewAnimatorListener(revealView, buttonView); - Animator reveal = UiThreadCircularReveal.createCircularReveal(revealView, width / 2, - height / 2, revealRadius, finalRadius); + Animator reveal = new CircleRevealOutlineProvider(width / 2, height / 2, + revealRadius, finalRadius).createRevealAnimator(revealView); reveal.setInterpolator(new LogDecelerateInterpolator(100, 0)); reveal.setDuration(revealDuration); reveal.setStartDelay(itemsAlphaStagger); |