summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-09-22 20:01:46 (GMT)
committerTony Wickham <twickham@google.com>2016-09-22 20:01:46 (GMT)
commite5a00c6172080b9dcdc5a2a2a942497b2f8f58f3 (patch)
tree3f31299c74dad9b1e2c74fb9c1aebe987ee226e4
parent4d917a9793ca0abd079859529a9966182d823c58 (diff)
downloadandroid_packages_apps_Trebuchet-e5a00c6172080b9dcdc5a2a2a942497b2f8f58f3.zip
android_packages_apps_Trebuchet-e5a00c6172080b9dcdc5a2a2a942497b2f8f58f3.tar.gz
android_packages_apps_Trebuchet-e5a00c6172080b9dcdc5a2a2a942497b2f8f58f3.tar.bz2
Move shortcut fade interpolator outside of loop.
Change-Id: I64806897afcd1062dfbaefd6dca07f024f7346af
-rw-r--r--src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index daab747..5ef1288 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -19,6 +19,7 @@ package com.android.launcher3.shortcuts;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
+import android.animation.TimeInterpolator;
import android.annotation.TargetApi;
import android.content.ComponentName;
import android.content.Context;
@@ -234,6 +235,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
final long arrowScaleDelay = duration - arrowScaleDuration;
final long stagger = getResources().getInteger(
R.integer.config_deepShortcutOpenStagger);
+ final TimeInterpolator fadeInterpolator = new LogAccelerateInterpolator(100, 0);
// Animate shortcuts
DecelerateInterpolator interpolator = new DecelerateInterpolator();
@@ -256,7 +258,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
shortcutAnims.play(anim);
Animator fadeAnim = new LauncherViewPropertyAnimator(deepShortcutView).alpha(1);
- fadeAnim.setInterpolator(new LogAccelerateInterpolator(100, 0));
+ fadeAnim.setInterpolator(fadeInterpolator);
// We want the shortcut to be fully opaque before the arrow starts animating.
fadeAnim.setDuration(arrowScaleDelay);
shortcutAnims.play(fadeAnim);
@@ -624,6 +626,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
R.integer.config_deepShortcutArrowOpenDuration);
final long stagger = getResources().getInteger(
R.integer.config_deepShortcutCloseStagger);
+ final TimeInterpolator fadeInterpolator = new LogAccelerateInterpolator(100, 0);
int firstOpenShortcutIndex = mIsAboveIcon ? shortcutCount - numOpenShortcuts : 0;
for (int i = firstOpenShortcutIndex; i < firstOpenShortcutIndex + numOpenShortcuts; i++) {
@@ -639,7 +642,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
// Don't start fading until the arrow is gone.
fadeAnim.setStartDelay(stagger * animationIndex + arrowScaleDuration);
fadeAnim.setDuration(duration - arrowScaleDuration);
- fadeAnim.setInterpolator(new LogAccelerateInterpolator(100, 0));
+ fadeAnim.setInterpolator(fadeInterpolator);
shortcutAnims.play(fadeAnim);
} else {
// The view is being dragged. Animate it such that it collapses with the drag view