diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-08 00:01:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 00:01:07 +0000 |
| commit | e80e2fc71e73dd125119bb8c30eea2d89409c6ad (patch) | |
| tree | 37a0ae529d07b52c6adf9caab79622dba5ee40bb /api | |
| parent | bf4c565cda250f46247cc3fbf43750d1be44fb95 (diff) | |
| parent | b466977765342754b45b946a8ace9f5f132db13f (diff) | |
| download | frameworks_base-e80e2fc71e73dd125119bb8c30eea2d89409c6ad.zip frameworks_base-e80e2fc71e73dd125119bb8c30eea2d89409c6ad.tar.gz frameworks_base-e80e2fc71e73dd125119bb8c30eea2d89409c6ad.tar.bz2 | |
am 91c091cf: Merge "State based animators for Views"
* commit '91c091cf7b732796d26971de6a508966e24d40a0':
State based animators for Views
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 957dcb4..94413d7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1061,6 +1061,7 @@ package android { field public static final int startDelay = 16843746; // 0x10103e2 field public static final int startOffset = 16843198; // 0x10101be field public static final deprecated int startYear = 16843132; // 0x101017c + field public static final int stateListAnimator = 16843860; // 0x1010454 field public static final int stateNotNeeded = 16842774; // 0x1010016 field public static final int state_above_anchor = 16842922; // 0x10100aa field public static final int state_accelerated = 16843547; // 0x101031b @@ -2788,6 +2789,7 @@ package android.animation { public class AnimatorInflater { ctor public AnimatorInflater(); method public static android.animation.Animator loadAnimator(android.content.Context, int) throws android.content.res.Resources.NotFoundException; + method public static android.animation.StateListAnimator loadStateListAnimator(android.content.Context, int) throws android.content.res.Resources.NotFoundException; } public abstract class AnimatorListenerAdapter implements android.animation.Animator.AnimatorListener android.animation.Animator.AnimatorPauseListener { @@ -2984,6 +2986,12 @@ package android.animation { method public android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect); } + public class StateListAnimator { + ctor public StateListAnimator(); + method public void addState(int[], android.animation.Animator); + method public void jumpToCurrentState(); + } + public class TimeAnimator extends android.animation.ValueAnimator { ctor public TimeAnimator(); method public void setTimeListener(android.animation.TimeAnimator.TimeListener); @@ -30834,6 +30842,7 @@ package android.view { method public final int getScrollY(); method public java.lang.String getSharedElementName(); method public int getSolidColor(); + method public android.animation.StateListAnimator getStateListAnimator(); method protected int getSuggestedMinimumHeight(); method protected int getSuggestedMinimumWidth(); method public int getSystemUiVisibility(); @@ -31098,6 +31107,7 @@ package android.view { method public void setSelected(boolean); method public void setSharedElementName(java.lang.String); method public void setSoundEffectsEnabled(boolean); + method public void setStateListAnimator(android.animation.StateListAnimator); method public void setSystemUiVisibility(int); method public void setTag(java.lang.Object); method public void setTag(int, java.lang.Object); |