summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-05-08 01:18:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-08 01:18:26 +0000
commit18ca6f3cc3b6ecaf949e60a671e5589bad7537de (patch)
tree36fe958db13a716871c6a96666cb29156145037f /packages/SystemUI/res
parentcb20502fb436260f6eeecec9172df6402db6c5ad (diff)
parent8a2a5fa0d1e399b45ee45cc754f0680cf51be5a4 (diff)
downloadframeworks_base-18ca6f3cc3b6ecaf949e60a671e5589bad7537de.zip
frameworks_base-18ca6f3cc3b6ecaf949e60a671e5589bad7537de.tar.gz
frameworks_base-18ca6f3cc3b6ecaf949e60a671e5589bad7537de.tar.bz2
am 7a11b237: Merge "Introduce AmbientState for StackScroller."
* commit '7a11b237632fa2822678901659ea3a50246d2ced': Introduce AmbientState for StackScroller.
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/values/ids.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml
index e5168c4..4369741 100644
--- a/packages/SystemUI/res/values/ids.xml
+++ b/packages/SystemUI/res/values/ids.xml
@@ -18,11 +18,13 @@
<resources>
<item type="id" name="translation_y_animator_tag"/>
<item type="id" name="translation_z_animator_tag"/>
+ <item type="id" name="scale_animator_tag"/>
<item type="id" name="alpha_animator_tag"/>
<item type="id" name="top_inset_animator_tag"/>
<item type="id" name="height_animator_tag"/>
<item type="id" name="translation_y_animator_end_value_tag"/>
<item type="id" name="translation_z_animator_end_value_tag"/>
+ <item type="id" name="scale_animator_end_value_tag"/>
<item type="id" name="alpha_animator_end_value_tag"/>
<item type="id" name="top_inset_animator_end_value_tag"/>
<item type="id" name="height_animator_end_value_tag"/>