summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2010-11-30 14:43:33 -0800
committerChet Haase <chet@google.com>2010-12-01 08:11:29 -0800
commit5bed88e12d0b4e77483e287c068fbf551ecf8a10 (patch)
treef1cf1fbf0e1028be7d5d2a27397168ce63a5c26e /core/res
parent7ae15f6c89a1d2d3b0ae3a05c594e545b1b7180a (diff)
downloadframeworks_base-5bed88e12d0b4e77483e287c068fbf551ecf8a10.zip
frameworks_base-5bed88e12d0b4e77483e287c068fbf551ecf8a10.tar.gz
frameworks_base-5bed88e12d0b4e77483e287c068fbf551ecf8a10.tar.bz2
Animators can now have dimension and color values.
You can now use floats, ints, dimensions, or colors as input values in XML for Animator objects. There is still a 'valueType' attribute that lets you specify the number values to create the animator with, though it defaults to floats (or in the case of color inputs, to ints). Change-Id: I65f1df802db602c33f2a0308a663b6f808148e25
Diffstat (limited to 'core/res')
-rwxr-xr-xcore/res/res/values/attrs.xml15
1 files changed, 6 insertions, 9 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index cc6dc2a..a911e8d 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3418,21 +3418,18 @@
greater than 0 or infinite. The default value is restart. -->
<attr name="repeatMode"/>
<!-- Value the animation starts from. -->
- <attr name="valueFrom" format="float|integer"/>
+ <attr name="valueFrom" format="float|integer|color|dimension"/>
<!-- Value the animation animates to. -->
- <attr name="valueTo" format="float|integer"/>
+ <attr name="valueTo" format="float|integer|color|dimension"/>
<!-- The type of valueFrom and valueTo. -->
<attr name="valueType">
- <!-- valueFrom and valueTo are floats. -->
+ <!-- valueFrom and valueTo are floats. This is the default value is valueType is
+ unspecified. Note that if either valueFrom or valueTo represent colors
+ (beginning with "#"), then this attribute is ignored and the color values are
+ interpreted as integers. -->
<enum name="floatType" value="0" />
<!-- valueFrom and valueTo are integers. -->
<enum name="intType" value="1" />
- <!-- valueFrom and valueTo are doubles. -->
- <enum name="doubleType" value="2" />
- <!-- valueFrom and valueTo are colors. -->
- <enum name="colorType" value="3" />
- <!-- valueFrom and valueTo are a custom type. -->
- <enum name="customType" value="4" />
</attr>
</declare-styleable>