diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 1d445cf..103eb2a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12191,6 +12191,7 @@ package android.graphics.drawable { method public int getOpacity(); method public boolean isRunning(); method public void registerAnimationCallback(android.graphics.drawable.Animatable2.AnimationCallback); + method public void reset(); method public void setAlpha(int); method public void setColorFilter(android.graphics.ColorFilter); method public void start(); @@ -24488,10 +24489,10 @@ package android.provider { public final class AlarmClock { ctor public AlarmClock(); + field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM"; field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM"; field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER"; field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; - field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM"; field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM"; field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all"; field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label"; diff --git a/api/system-current.txt b/api/system-current.txt index ae4bae6..1d3995a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12504,6 +12504,7 @@ package android.graphics.drawable { method public int getOpacity(); method public boolean isRunning(); method public void registerAnimationCallback(android.graphics.drawable.Animatable2.AnimationCallback); + method public void reset(); method public void setAlpha(int); method public void setColorFilter(android.graphics.ColorFilter); method public void start(); @@ -26418,10 +26419,10 @@ package android.provider { public final class AlarmClock { ctor public AlarmClock(); + field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM"; field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM"; field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER"; field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; - field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM"; field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM"; field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all"; field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label"; diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 96f86b4..1ae10d3 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -578,6 +578,15 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { return mAnimatorSet.isStarted(); } + /** + * Resets the AnimatedVectorDrawable to the start state as specified in the animators. + */ + public void reset() { + // TODO: Use reverse or seek to implement reset, when AnimatorSet supports them. + start(); + mAnimatorSet.cancel(); + } + @Override public void start() { ensureAnimatorSet(); |