diff options
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/anim/wallpaper_close_enter.xml | 5 | ||||
-rw-r--r-- | core/res/res/anim/wallpaper_open_enter.xml | 2 | ||||
-rw-r--r-- | core/res/res/anim/wallpaper_open_exit.xml | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/res/res/anim/wallpaper_close_enter.xml b/core/res/res/anim/wallpaper_close_enter.xml index 2329abb..6eb2a89 100644 --- a/core/res/res/anim/wallpaper_close_enter.xml +++ b/core/res/res/anim/wallpaper_close_enter.xml @@ -20,14 +20,15 @@ <!-- This version zooms the new non-wallpaper up out of the wallpaper, without zooming the wallpaper itself. --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator" android:zAdjustment="top"> <scale android:fromXScale=".5" android:toXScale="1.0" android:fromYScale=".5" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/decelerate_interpolator" android:duration="@android:integer/config_mediumAnimTime" /> <alpha android:fromAlpha="0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime"/> + android:interpolator="@anim/accelerate_decelerate_interpolator" + android:duration="@android:integer/config_mediumAnimTime"/> </set> <!-- This version zooms the new non-wallpaper down on top of the diff --git a/core/res/res/anim/wallpaper_open_enter.xml b/core/res/res/anim/wallpaper_open_enter.xml index 3a6fb05..a32c39e 100644 --- a/core/res/res/anim/wallpaper_open_enter.xml +++ b/core/res/res/anim/wallpaper_open_enter.xml @@ -17,7 +17,7 @@ */ --> -<!-- This version zooms the new non-wallpaper up out of the +<!-- This version zooms the exiting non-wallpaper down in to the wallpaper, without zooming the wallpaper itself. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/decelerate_interpolator" diff --git a/core/res/res/anim/wallpaper_open_exit.xml b/core/res/res/anim/wallpaper_open_exit.xml index e5b7007..8f0e012 100644 --- a/core/res/res/anim/wallpaper_open_exit.xml +++ b/core/res/res/anim/wallpaper_open_exit.xml @@ -16,16 +16,17 @@ ** limitations under the License. */ --> -<!-- This version zooms the new non-wallpaper up out of the +<!-- This version zooms the exiting non-wallpaper down in to the wallpaper, without zooming the wallpaper itself. --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator" android:zAdjustment="top"> <scale android:fromXScale="1.0" android:toXScale=".5" android:fromYScale="1.0" android:toYScale=".5" android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/decelerate_interpolator" android:duration="@android:integer/config_mediumAnimTime" /> <alpha android:fromAlpha="1.0" android:toAlpha="0" + android:interpolator="@anim/accelerate_decelerate_interpolator" android:duration="@android:integer/config_mediumAnimTime"/> </set> |