diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 15:04:51 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 15:05:09 -0800 |
commit | a52ecb0390c85afb385371bb844bb496c59ddf87 (patch) | |
tree | a3a0a6fff80e059a0a10181fb74164aa3e642758 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
parent | 90a40570bc54506979d3610ee331deacfa7300ec (diff) | |
download | android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.tar.gz android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.tar.bz2 android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.zip |
Removing all compatibility code below Lollipop
Bug: 32745285
Change-Id: I62971908e3e4402941fab627bbdfd47be64473a3
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 103 |
1 files changed, 35 insertions, 68 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 19cc0fbe5..39c466db8 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -23,14 +23,10 @@ import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; -import android.annotation.TargetApi; import android.content.res.Resources; -import android.os.Build; import android.util.Log; import android.view.View; import android.view.animation.AccelerateInterpolator; -import android.view.animation.Animation; -import android.view.animation.DecelerateInterpolator; import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsTransitionController; @@ -229,7 +225,6 @@ public class LauncherStateTransitionAnimation { final boolean animated, int animType, final PrivateTransitionCallbacks pCb) { final AnimatorSet animation = LauncherAnimUtils.createAnimatorSet(); final Resources res = mLauncher.getResources(); - final boolean material = Utilities.ATLEAST_LOLLIPOP; final int revealDuration = res.getInteger(R.integer.config_overlayRevealTime); final int revealDurationSlide = res.getInteger(R.integer.config_overlaySlideRevealTime); @@ -276,20 +271,11 @@ public class LauncherStateTransitionAnimation { revealView.setTranslationX(0f); // Calculate the final animation values - final float revealViewToAlpha; - final float revealViewToXDrift; - final float revealViewToYDrift; - if (material) { - int[] buttonViewToPanelDelta = Utilities.getCenterDeltaInScreenSpace( - revealView, buttonView, null); - revealViewToAlpha = pCb.materialRevealViewFinalAlpha; - revealViewToYDrift = buttonViewToPanelDelta[1]; - revealViewToXDrift = buttonViewToPanelDelta[0]; - } else { - revealViewToAlpha = 0f; - revealViewToYDrift = 2 * height / 3; - revealViewToXDrift = 0; - } + int[] buttonViewToPanelDelta = + Utilities.getCenterDeltaInScreenSpace(revealView, buttonView); + final float revealViewToAlpha = pCb.materialRevealViewFinalAlpha; + final float revealViewToXDrift = buttonViewToPanelDelta[0]; + final float revealViewToYDrift = buttonViewToPanelDelta[1]; // Create the animators PropertyValuesHolder panelAlpha = @@ -327,19 +313,17 @@ public class LauncherStateTransitionAnimation { itemsAlpha.setStartDelay(itemsAlphaStagger); animation.play(itemsAlpha); - if (material) { - float startRadius = pCb.getMaterialRevealViewStartFinalRadius(); - AnimatorListenerAdapter listener = pCb.getMaterialRevealViewAnimatorListener( - revealView, buttonView); - Animator reveal = new CircleRevealOutlineProvider(width / 2, height / 2, - startRadius, revealRadius).createRevealAnimator(revealView); - reveal.setDuration(revealDuration); - reveal.setInterpolator(new LogDecelerateInterpolator(100, 0)); - if (listener != null) { - reveal.addListener(listener); - } - animation.play(reveal); + float startRadius = pCb.getMaterialRevealViewStartFinalRadius(); + AnimatorListenerAdapter listener = pCb.getMaterialRevealViewAnimatorListener( + revealView, buttonView); + Animator reveal = new CircleRevealOutlineProvider(width / 2, height / 2, + startRadius, revealRadius).createRevealAnimator(revealView); + reveal.setDuration(revealDuration); + reveal.setInterpolator(new LogDecelerateInterpolator(100, 0)); + if (listener != null) { + reveal.addListener(listener); } + animation.play(reveal); animation.addListener(new AnimatorListenerAdapter() { @Override @@ -531,11 +515,9 @@ public class LauncherStateTransitionAnimation { final PrivateTransitionCallbacks pCb) { final AnimatorSet animation = LauncherAnimUtils.createAnimatorSet(); final Resources res = mLauncher.getResources(); - final boolean material = Utilities.ATLEAST_LOLLIPOP; final int revealDuration = res.getInteger(R.integer.config_overlayRevealTime); final int revealDurationSlide = res.getInteger(R.integer.config_overlaySlideRevealTime); - final int itemsAlphaStagger = - res.getInteger(R.integer.config_overlayItemsAlphaStagger); + final int itemsAlphaStagger = res.getInteger(R.integer.config_overlayItemsAlphaStagger); final View toView = mLauncher.getWorkspace(); final View revealView = fromView.getRevealView(); @@ -579,24 +561,14 @@ public class LauncherStateTransitionAnimation { layerViews.addView(revealView); // Calculate the final animation values - final float revealViewToXDrift; - final float revealViewToYDrift; - if (material) { - int[] buttonViewToPanelDelta = Utilities.getCenterDeltaInScreenSpace(revealView, - buttonView, null); - revealViewToYDrift = buttonViewToPanelDelta[1]; - revealViewToXDrift = buttonViewToPanelDelta[0]; - } else { - revealViewToYDrift = 2 * height / 3; - revealViewToXDrift = 0; - } + int[] buttonViewToPanelDelta = Utilities.getCenterDeltaInScreenSpace(revealView, buttonView); + final float revealViewToXDrift = buttonViewToPanelDelta[0]; + final float revealViewToYDrift = buttonViewToPanelDelta[1]; // The vertical motion of the apps panel should be delayed by one frame // from the conceal animation in order to give the right feel. We correspondingly // shorten the duration so that the slide and conceal end at the same time. - TimeInterpolator decelerateInterpolator = material ? - new LogDecelerateInterpolator(100, 0) : - new DecelerateInterpolator(1f); + TimeInterpolator decelerateInterpolator = new LogDecelerateInterpolator(100, 0); ObjectAnimator panelDriftY = ObjectAnimator.ofFloat(revealView, "translationY", 0, revealViewToYDrift); panelDriftY.setDuration(revealDuration - SINGLE_FRAME_DELAY); @@ -612,13 +584,10 @@ public class LauncherStateTransitionAnimation { animation.play(panelDriftX); // Setup animation for the reveal panel alpha - final float revealViewToAlpha = !material ? 0f : - pCb.materialRevealViewFinalAlpha; - if (revealViewToAlpha != 1f) { + if (pCb.materialRevealViewFinalAlpha != 1f) { ObjectAnimator panelAlpha = ObjectAnimator.ofFloat(revealView, "alpha", - 1f, revealViewToAlpha); - panelAlpha.setDuration(material ? revealDuration : 150); - panelAlpha.setStartDelay(material ? 0 : itemsAlphaStagger + SINGLE_FRAME_DELAY); + 1f, pCb.materialRevealViewFinalAlpha); + panelAlpha.setDuration(revealDuration); panelAlpha.setInterpolator(decelerateInterpolator); animation.play(panelAlpha); } @@ -652,21 +621,19 @@ public class LauncherStateTransitionAnimation { }); animation.play(invalidateScrim); - if (material) { - // Animate the all apps button - float finalRadius = pCb.getMaterialRevealViewStartFinalRadius(); - AnimatorListenerAdapter listener = - pCb.getMaterialRevealViewAnimatorListener(revealView, buttonView); - Animator reveal = new CircleRevealOutlineProvider(width / 2, height / 2, - revealRadius, finalRadius).createRevealAnimator(revealView); - reveal.setInterpolator(new LogDecelerateInterpolator(100, 0)); - reveal.setDuration(revealDuration); - reveal.setStartDelay(itemsAlphaStagger); - if (listener != null) { - reveal.addListener(listener); - } - animation.play(reveal); + // Animate the all apps button + float finalRadius = pCb.getMaterialRevealViewStartFinalRadius(); + AnimatorListenerAdapter listener = + pCb.getMaterialRevealViewAnimatorListener(revealView, buttonView); + Animator reveal = new CircleRevealOutlineProvider(width / 2, height / 2, + revealRadius, finalRadius).createRevealAnimator(revealView); + reveal.setInterpolator(new LogDecelerateInterpolator(100, 0)); + reveal.setDuration(revealDuration); + reveal.setStartDelay(itemsAlphaStagger); + if (listener != null) { + reveal.addListener(listener); } + animation.play(reveal); } animation.addListener(new AnimatorListenerAdapter() { |