PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move shortcut fade interpolator outside of loop.

Browse Source 
am: e5a00c6172

Change-Id: I7b2c15b04a7656b136f5d6f0c54f13030c5b9563
This commit is contained in:
Tony Wickham
2016-09-22 21:09:19 +00:00
committed by android-build-merger
parent 99fed5fa07 e5a00c6172
commit f2e075133e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+5 -2
View File
@@ -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;
@@ -235,6 +236,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();
@@ -257,7 +259,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);
@@ -625,6 +627,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++) {
@@ -640,7 +643,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