diff options
| author | 2012-06-20 19:28:16 -0700 | |
|---|---|---|
| committer | 2012-06-20 19:28:16 -0700 | |
| commit | 255cb7798160a083124cd2033e0619f8b3ed731c (patch) | |
| tree | 86b75b2246b8ab80c86cde13aa0c11af55338514 | |
| parent | 5070a7f0f4bf817e884b9e6ea8ee23c99209c50e (diff) | |
| parent | a371154f08246e89c4cb4d5eaefd0b496ecc5632 (diff) | |
Merge "Make animations persist after completion." into jb-dev
| -rw-r--r-- | core/res/res/anim/activity_open_enter.xml | 4 | ||||
| -rw-r--r-- | core/res/res/anim/activity_open_exit.xml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml index c92f00021e6d..d553bdfc98ef 100644 --- a/core/res/res/anim/activity_open_enter.xml +++ b/core/res/res/anim/activity_open_enter.xml @@ -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>
\ No newline at end of file diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml index d7bfe8252193..2d105d185baa 100644 --- a/core/res/res/anim/activity_open_exit.xml +++ b/core/res/res/anim/activity_open_exit.xml @@ -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>
\ No newline at end of file |