Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e96f06ae authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 255cb779: Merge "Make animations persist after completion." into jb-dev 

* commit '255cb779':
  Make animations persist after completion.
parents e523faa8 255cb779

core/res/res/anim/activity_open_enter.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

core/res/res/anim/activity_open_exit.xml

+3 −2
Original line number Diff line number Diff line
@@ -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