aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Adding support for tagging animations per controller, so that they can be controlled independently" into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-07 22:11:40 +00:00
committed by Android (Google) Code Review
parent 9a774e4489 e3c6d58b71
commit 47f5914069
7 changed files with 80 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/launcher3/Workspace.java
View File

@@ -26,7 +26,6 @@ import static com.android.launcher3.Utilities.isAccessibilityEnabled;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.LayoutTransition;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
@@ -64,6 +63,7 @@ import com.android.launcher3.accessibility.AccessibleDragListenerAdapter;
import com.android.launcher3.accessibility.OverviewScreenAccessibilityDelegate;
import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper;
import com.android.launcher3.anim.AnimationLayerSet;
import com.android.launcher3.anim.AnimatorSetBuilder;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.badge.FolderBadgeInfo;
import com.android.launcher3.compat.AppWidgetManagerCompat;
@@ -1548,9 +1548,9 @@ public class Workspace extends PagedView
*/
@Override
public void setStateWithAnimation(LauncherState toState, AnimationLayerSet layerViews,
AnimatorSet anim, AnimationConfig config) {
AnimatorSetBuilder builder, AnimationConfig config) {
StateTransitionListener listener = new StateTransitionListener(toState);
mStateTransitionAnimation.setStateWithAnimation(toState, anim, layerViews, config);
mStateTransitionAnimation.setStateWithAnimation(toState, builder, layerViews, config);
// Invalidate the pages now, so that we have the visible pages before the
// animation is started
@@ -1562,8 +1562,8 @@ public class Workspace extends PagedView
ValueAnimator stepAnimator = ValueAnimator.ofFloat(0, 1);
stepAnimator.addUpdateListener(listener);
stepAnimator.setDuration(config.duration);
anim.play(stepAnimator);
anim.addListener(listener);
stepAnimator.addListener(listener);
builder.play(stepAnimator);
}
public void updateAccessibilityFlags() {