aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing Launcher activity dependency on various animations

Browse Source 
(This cl reverts change-Id: I455edcd17bda83ab51c2c04fa40e66097a4d6975)

Various animations were marked for cancellation when launcher activity is
destroyed. This this does not work with multiple activities (Launcher,
fallback recents, shortcut confirmation). Also since launcher activity
handles configuration changes, the activity is not destroyed often.

Instead associating a target with various animations which automatically
cancels the animations when that target goes away.

Change-Id: I64cd095a28075561a9e20c9dcdeb9f90c18e1047
This commit is contained in:
Sunny Goyal
2018-08-08 16:33:46 -07:00
parent 52b28f0926
commit 849c6a2b18
15 changed files with 149 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/launcher3/InterruptibleInOutAnimator.java
View File

@@ -18,7 +18,9 @@ package com.android.launcher3;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.util.Property;
import android.view.View;
import com.android.launcher3.util.Thunk;
@@ -31,11 +33,27 @@ import com.android.launcher3.util.Thunk;
* interpolator in the same direction.
*/
public class InterruptibleInOutAnimator {
private static final Property<InterruptibleInOutAnimator, Float> VALUE =
new Property<InterruptibleInOutAnimator, Float>(Float.TYPE, "value") {
@Override
public Float get(InterruptibleInOutAnimator anim) {
return anim.mValue;
}
@Override
public void set(InterruptibleInOutAnimator anim, Float value) {
anim.mValue = value;
}
};
private long mOriginalDuration;
private float mOriginalFromValue;
private float mOriginalToValue;
private ValueAnimator mAnimator;
private float mValue;
private boolean mFirstRun = true;
private Object mTag = null;
@@ -47,8 +65,8 @@ public class InterruptibleInOutAnimator {
// TODO: This isn't really necessary, but is here to help diagnose a bug in the drag viz
@Thunk int mDirection = STOPPED;
public InterruptibleInOutAnimator(View view, long duration, float fromValue, float toValue) {
mAnimator = LauncherAnimUtils.ofFloat(fromValue, toValue).setDuration(duration);
public InterruptibleInOutAnimator(long duration, float fromValue, float toValue) {
mAnimator = ObjectAnimator.ofFloat(this, VALUE, fromValue, toValue).setDuration(duration);
mOriginalDuration = duration;
mOriginalFromValue = fromValue;
mOriginalToValue = toValue;
@@ -64,8 +82,7 @@ public class InterruptibleInOutAnimator {
private void animate(int direction) {
final long currentPlayTime = mAnimator.getCurrentPlayTime();
final float toValue = (direction == IN) ? mOriginalToValue : mOriginalFromValue;
final float startValue = mFirstRun ? mOriginalFromValue :
((Float) mAnimator.getAnimatedValue()).floatValue();
final float startValue = mFirstRun ? mOriginalFromValue : mValue;
// Make sure it's stopped before we modify any values
cancel();