Merge "Make animations persist after completion." into jb-dev

This commit is contained in:
Craig Mautner
2012-06-20 19:28:16 -07:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 4 deletions

View File

@@ -23,13 +23,13 @@
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:interpolator="@interpolator/decelerate_cubic"
android:fillEnabled="true"
android:fillBefore="false" android:fillAfter="false"
android:fillBefore="false" android:fillAfter="true"
android:duration="300"/>
<scale android:fromXScale=".8" android:toXScale="1.0"
android:fromYScale=".8" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:fillEnabled="true"
android:fillBefore="false" android:fillAfter="false"
android:fillBefore="false" android:fillAfter="true"
android:duration="300"/>
</set>

View File

@@ -17,9 +17,10 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:fillEnabled="true" android:fillBefore="false" android:fillAfter="false"
android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quint"
android:duration="300"/>
</set>