diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-10-26 13:42:13 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2010-10-27 13:29:00 -0700 |
| commit | 21b4b04f6dbc91702f5dc29201723ce2d73b6acd (patch) | |
| tree | 4f4747a4e3057ee1b07a2690d9f1f1b7e540022d | |
| parent | 73b1089d9e626d53eb1a20cea800cfde65eb4299 (diff) | |
| download | frameworks_base-21b4b04f6dbc91702f5dc29201723ce2d73b6acd.zip frameworks_base-21b4b04f6dbc91702f5dc29201723ce2d73b6acd.tar.gz frameworks_base-21b4b04f6dbc91702f5dc29201723ce2d73b6acd.tar.bz2 | |
Wallpaper transition changed to fade instead of translate/scale/fade.
This is mainly to have a quick transition into QSB so that it feels light-weight.
Bug: 3132162
| -rw-r--r-- | core/res/res/anim/wallpaper_intra_close_enter.xml | 10 | ||||
| -rw-r--r-- | core/res/res/anim/wallpaper_intra_close_exit.xml | 12 | ||||
| -rw-r--r-- | core/res/res/anim/wallpaper_intra_open_enter.xml | 10 | ||||
| -rw-r--r-- | core/res/res/anim/wallpaper_intra_open_exit.xml | 12 |
4 files changed, 10 insertions, 34 deletions
diff --git a/core/res/res/anim/wallpaper_intra_close_enter.xml b/core/res/res/anim/wallpaper_intra_close_enter.xml index 5c4f5c9..73bf9a3 100644 --- a/core/res/res/anim/wallpaper_intra_close_enter.xml +++ b/core/res/res/anim/wallpaper_intra_close_enter.xml @@ -20,12 +20,6 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/decelerate_interpolator" android:zAdjustment="top"> - <scale android:fromXScale="2.0" android:toXScale="1.0" - android:fromYScale="2.0" android:toYScale="1.0" - android:pivotX="100%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> - <translate android:fromXDelta="-150%p" android:toXDelta="0%p" - android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> + <alpha android:fromAlpha="0.5" android:toAlpha="1.0" + android:duration="@android:integer/config_shortAnimTime" /> </set> diff --git a/core/res/res/anim/wallpaper_intra_close_exit.xml b/core/res/res/anim/wallpaper_intra_close_exit.xml index acaf773..d43660e 100644 --- a/core/res/res/anim/wallpaper_intra_close_exit.xml +++ b/core/res/res/anim/wallpaper_intra_close_exit.xml @@ -18,13 +18,7 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/accelerate_interpolator"> - <scale android:fromXScale="1.0" android:toXScale=".5" - android:fromYScale="1.0" android:toYScale=".5" - android:pivotX="100%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> - <translate android:fromXDelta="0%p" android:toXDelta="100%p" - android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_mediumAnimTime"/> + android:interpolator="@anim/decelerate_interpolator"> + <alpha android:fromAlpha="0.5" android:toAlpha="0.0" + android:duration="@android:integer/config_shortAnimTime"/> </set> diff --git a/core/res/res/anim/wallpaper_intra_open_enter.xml b/core/res/res/anim/wallpaper_intra_open_enter.xml index 81c9991..c85ca4c 100644 --- a/core/res/res/anim/wallpaper_intra_open_enter.xml +++ b/core/res/res/anim/wallpaper_intra_open_enter.xml @@ -19,12 +19,6 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/decelerate_interpolator"> - <scale android:fromXScale=".5" android:toXScale="1.0" - android:fromYScale=".5" android:toYScale="1.0" - android:pivotX="100%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> - <translate android:fromXDelta="100%p" android:toXDelta="0" - android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> + <alpha android:fromAlpha="0.5" android:toAlpha="1.0" + android:duration="@android:integer/config_shortAnimTime" /> </set> diff --git a/core/res/res/anim/wallpaper_intra_open_exit.xml b/core/res/res/anim/wallpaper_intra_open_exit.xml index 28c4287..eaeac22 100644 --- a/core/res/res/anim/wallpaper_intra_open_exit.xml +++ b/core/res/res/anim/wallpaper_intra_open_exit.xml @@ -18,14 +18,8 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/accelerate_interpolator" + android:interpolator="@anim/decelerate_interpolator" android:zAdjustment="top"> - <scale android:fromXScale="1.0" android:toXScale="2.0" - android:fromYScale="1.0" android:toYScale="2.0" - android:pivotX="100%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> - <translate android:fromXDelta="0" android:toXDelta="-150%p" - android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_mediumAnimTime"/> + <alpha android:fromAlpha="0.5" android:toAlpha="0.0" + android:duration="@android:integer/config_shortAnimTime"/> </set> |