Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2012-06-20 19:28:16 -07:00
committed by Android (Google) Code Review
parent 5070a7f0f4 a371154f08
commit 255cb77981
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/anim/activity_open_enter.xml
View File

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

5
core/res/res/anim/activity_open_exit.xml
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" <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:interpolator="@interpolator/decelerate_quint"
android:duration="300"/> android:duration="300"/>
</set> </set>