summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-05-09 22:25:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-09 22:25:42 +0000
commit9edceb71d056ec0a78727d6de5efce1f3135bd21 (patch)
tree2fafec205384083dfc53553724a1617b9a025004 /api
parenta020ef520107e0fb0b83dd245fb1e2d1ce0ff57f (diff)
parent5e92c95d847a68178cf6099c801f82dcb7e4fa47 (diff)
downloadframeworks_base-9edceb71d056ec0a78727d6de5efce1f3135bd21.zip
frameworks_base-9edceb71d056ec0a78727d6de5efce1f3135bd21.tar.gz
frameworks_base-9edceb71d056ec0a78727d6de5efce1f3135bd21.tar.bz2
am 9f4c7f31: Animated state transition drawable
* commit '9f4c7f31b47680973e4e2a23f09e4d5281a40ed0': Animated state transition drawable
Diffstat (limited to 'api')
-rw-r--r--api/current.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 21fba5d..5e1e400 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -567,6 +567,7 @@ package android {
field public static final int freezesText = 16843116; // 0x101016c
field public static final int fromAlpha = 16843210; // 0x10101ca
field public static final int fromDegrees = 16843187; // 0x10101b3
+ field public static final int fromId = 16843856; // 0x1010450
field public static final int fromScene = 16843741; // 0x10103dd
field public static final int fromXDelta = 16843206; // 0x10101c6
field public static final int fromXScale = 16843202; // 0x10101c2
@@ -956,6 +957,7 @@ package android {
field public static final int restoreAnyVersion = 16843450; // 0x10102ba
field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
field public static final int restrictedAccountType = 16843733; // 0x10103d5
+ field public static final int reversible = 16843857; // 0x1010451
field public static final int right = 16843183; // 0x10101af
field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
field public static final int ringtoneType = 16843257; // 0x10101f9
@@ -1214,6 +1216,7 @@ package android {
field public static final int titleTextStyle = 16843512; // 0x10102f8
field public static final int toAlpha = 16843211; // 0x10101cb
field public static final int toDegrees = 16843188; // 0x10101b4
+ field public static final int toId = 16843855; // 0x101044f
field public static final int toScene = 16843742; // 0x10103de
field public static final int toXDelta = 16843207; // 0x10101c7
field public static final int toXScale = 16843203; // 0x10101c3
@@ -10830,6 +10833,12 @@ package android.graphics.drawable {
method public abstract void stop();
}
+ public class AnimatedStateListDrawable extends android.graphics.drawable.StateListDrawable {
+ ctor public AnimatedStateListDrawable();
+ method public void addState(int[], android.graphics.drawable.Drawable, int);
+ method public void addTransition(int, int, android.graphics.drawable.AnimationDrawable, boolean);
+ }
+
public class AnimationDrawable extends android.graphics.drawable.DrawableContainer implements android.graphics.drawable.Animatable java.lang.Runnable {
ctor public AnimationDrawable();
method public void addFrame(android.graphics.drawable.Drawable, int);