summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/anim
diff options
context:
space:
mode:
authorTony <twickham@google.com>2019-03-19 14:55:22 -0500
committerTony <twickham@google.com>2019-03-27 14:21:06 -0500
commit9244f518f2a4d88d61cdf9e522c47aeedd43fdd6 (patch)
treea9cf2c71cb007de4da555af7c780b62020e7d661 /src/com/android/launcher3/anim
parent4397d8d5ea53e4b31d6e445ec048bc21ad87a560 (diff)
downloadandroid_packages_apps_Trebuchet-9244f518f2a4d88d61cdf9e522c47aeedd43fdd6.tar.gz
android_packages_apps_Trebuchet-9244f518f2a4d88d61cdf9e522c47aeedd43fdd6.tar.bz2
android_packages_apps_Trebuchet-9244f518f2a4d88d61cdf9e522c47aeedd43fdd6.zip
Add FLAG_DONT_ANIMATE_OVERVIEW to AnimatorSetBuilder
This allows us to specify when a second animation will handle the overview animation, so it doesn't conflict with existing state transitions. Bug: 125362112 Change-Id: I497c02924862bfba558c107bee3c88a9f40ec0f1
Diffstat (limited to 'src/com/android/launcher3/anim')
-rw-r--r--src/com/android/launcher3/anim/AnimatorSetBuilder.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/launcher3/anim/AnimatorSetBuilder.java b/src/com/android/launcher3/anim/AnimatorSetBuilder.java
index fdac5c85f..e135c0d7d 100644
--- a/src/com/android/launcher3/anim/AnimatorSetBuilder.java
+++ b/src/com/android/launcher3/anim/AnimatorSetBuilder.java
@@ -35,15 +35,13 @@ public class AnimatorSetBuilder {
public static final int ANIM_OVERVIEW_FADE = 4;
public static final int ANIM_ALL_APPS_FADE = 5;
+ public static final int FLAG_DONT_ANIMATE_OVERVIEW = 1 << 0;
+
protected final ArrayList<Animator> mAnims = new ArrayList<>();
private final SparseArray<Interpolator> mInterpolators = new SparseArray<>();
private List<Runnable> mOnFinishRunnables = new ArrayList<>();
-
- /**
- * Associates a tag with all the animations added after this call.
- */
- public void startTag(Object obj) { }
+ private int mFlags = 0;
public void play(Animator anim) {
mAnims.add(anim);
@@ -77,4 +75,12 @@ public class AnimatorSetBuilder {
public void setInterpolator(int animId, Interpolator interpolator) {
mInterpolators.put(animId, interpolator);
}
+
+ public void addFlag(int flag) {
+ mFlags |= flag;
+ }
+
+ public boolean hasFlag(int flag) {
+ return (mFlags & flag) != 0;
+ }
}