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

Commit 479e8004 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 89becd79: Fix issue #2177262: Improve animations 

Merge commit '89becd79' into eclair-mr2

* commit '89becd79':
  Fix issue #2177262: Improve animations
parents dc76d696 89becd79

core/res/res/anim/lock_screen_behind_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_interpolator">

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

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

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

</set>

core/res/res/anim/lock_screen_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_interpolator">

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

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

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

</set>

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 
    <integer name="config_shortAnimTime">150</integer>

    

    <!-- The duration (in milliseconds) of a medium-length animation. -->

    <integer name="config_mediumAnimTime">200</integer>

    <integer name="config_mediumAnimTime">300</integer>

    

    <!-- The duration (in milliseconds) of a long animation. -->

    <integer name="config_longAnimTime">350</integer>

    <integer name="config_longAnimTime">400</integer>



    <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.

         Please don't copy them, copy anything else. -->