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

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

Merge "Revert to ICS screen rotation animation."

parents 9492947a 187ae210

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_longAnimTime" />

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

</set>

core/res/res/anim/screen_rotate_180_exit.xml

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

            android:fillEnabled="true"

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

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

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

    <alpha android:fromAlpha="1.0" android:toAlpha="0"

            android:interpolator="@interpolator/decelerate_cubic"

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

</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_longAnimTime" />

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

</set>

core/res/res/anim/screen_rotate_minus_90_enter.xml

+8 −0
Original line number Diff line number Diff line
@@ -19,10 +19,18 @@ 


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

        android:shareInterpolator="false">

    <!-- Version for two-phase anim

    <rotate android:fromDegrees="-90" android:toDegrees="0"

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

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

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

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

    -->

    <rotate android:fromDegrees="-90" android:toDegrees="0"

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

            android:fillEnabled="true"

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

            android:interpolator="@interpolator/decelerate_quint"

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

</set>

core/res/res/anim/screen_rotate_minus_90_exit.xml

+20 −0
Original line number Diff line number Diff line
@@ -19,10 +19,30 @@ 


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

        android:shareInterpolator="false">

    <!-- Version for two-phase animation

    <rotate android:fromDegrees="0" android:toDegrees="90"

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

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

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

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

    -->

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

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

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

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

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

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

    <rotate android:fromDegrees="0" android:toDegrees="90"

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

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

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

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

    <alpha android:fromAlpha="1.0" android:toAlpha="0"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

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

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

</set>