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

Commit 55b4b286 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Improved rotation animation."

parents d4933842 191874e3

core/res/res/anim/screen_rotate_180_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_mediumAnimTime" />

            android:duration="@android:integer/config_longAnimTime" />

</set>

core/res/res/anim/screen_rotate_180_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_mediumAnimTime" />

            android:duration="@android:integer/config_longAnimTime" />

</set>
 
 No newline at end of file

core/res/res/anim/screen_rotate_180_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_mediumAnimTime" />

            android:duration="@android:integer/config_longAnimTime" />

</set>

core/res/res/anim/screen_rotate_finish_enter.xml

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_shortAnimTime"/>

    <!--

    <scale android:fromXScale="100%p" android:toXScale="100%"

            android:fromYScale="100%p" android:toYScale="100%"

            android:pivotX="50%" android:pivotY="50%"
@@ -34,5 +33,4 @@ 
            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_mediumAnimTime" />

    -->

</set>

core/res/res/anim/screen_rotate_finish_exit.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale="1.0" android:toYScale="1.0"

    <scale android:fromXScale="1.0" android:toXScale="1.1111111111111"

            android:fromYScale="1.0" android:toYScale="1.1111111111111"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"