diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-11-09 18:59:09 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-11-09 19:04:49 -0800 |
| commit | 6c8e20f96ae26533eb8081f4eab845ec710f9c9b (patch) | |
| tree | 6fe0a572dd444b34a8ffe732812fd8afeb2aa547 /core | |
| parent | cb120a9ba707b08242ebe3e1180379f626088e5a (diff) | |
| download | frameworks_base-6c8e20f96ae26533eb8081f4eab845ec710f9c9b.zip frameworks_base-6c8e20f96ae26533eb8081f4eab845ec710f9c9b.tar.gz frameworks_base-6c8e20f96ae26533eb8081f4eab845ec710f9c9b.tar.bz2 | |
Implement new task transition animations.
Change-Id: I62c10e7b2afac4371b3739f1cd5948c655edc125
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/anim/task_close_enter.xml | 15 | ||||
| -rw-r--r-- | core/res/res/anim/task_close_exit.xml | 8 | ||||
| -rw-r--r-- | core/res/res/anim/task_open_enter.xml | 4 | ||||
| -rw-r--r-- | core/res/res/anim/task_open_exit.xml | 15 |
4 files changed, 36 insertions, 6 deletions
diff --git a/core/res/res/anim/task_close_enter.xml b/core/res/res/anim/task_close_enter.xml index 3c971da..9bec8a3 100644 --- a/core/res/res/anim/task_close_enter.xml +++ b/core/res/res/anim/task_close_enter.xml @@ -18,8 +18,17 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false"> - <!-- Do nothing. --> - <alpha android:fromAlpha="1.0" android:toAlpha="1.0" + android:detachWallpaper="true" android:shareInterpolator="false"> + <scale android:fromXScale="1.0" android:toXScale="1.0" + android:fromYScale="0.9" android:toYScale="1.0" + android:pivotX="50%p" android:pivotY="50%p" + android:fillEnabled="true" android:fillBefore="true" + android:interpolator="@anim/decelerate_quint_interpolator" + android:startOffset="@android:integer/config_mediumAnimTime" + android:duration="@android:integer/config_mediumAnimTime" /> + <alpha android:fromAlpha="0" android:toAlpha="1.0" + android:fillEnabled="true" android:fillBefore="true" + android:interpolator="@anim/decelerate_cubic_interpolator" + android:startOffset="@android:integer/config_mediumAnimTime" android:duration="@android:integer/config_mediumAnimTime"/> </set> diff --git a/core/res/res/anim/task_close_exit.xml b/core/res/res/anim/task_close_exit.xml index 2001e20..ca60214 100644 --- a/core/res/res/anim/task_close_exit.xml +++ b/core/res/res/anim/task_close_exit.xml @@ -22,9 +22,15 @@ <scale android:fromXScale="1.0" android:toXScale="1.0" android:fromYScale="1.0" android:toYScale="0.9" android:pivotX="50%p" android:pivotY="50%p" + android:fillEnabled="true" android:fillAfter="true" android:interpolator="@anim/decelerate_quint_interpolator" android:duration="@android:integer/config_mediumAnimTime" /> <alpha android:fromAlpha="1.0" android:toAlpha="0" - android:interpolator="@anim/decelerate_cubic_interpolator" + android:fillEnabled="true" android:fillAfter="true" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_mediumAnimTime"/> + <!-- This is just to keep the animation running for the entire duration. --> + <alpha android:fromAlpha="1.0" android:toAlpha="1.0" + android:startOffset="@android:integer/config_mediumAnimTime" android:duration="@android:integer/config_mediumAnimTime"/> </set> diff --git a/core/res/res/anim/task_open_enter.xml b/core/res/res/anim/task_open_enter.xml index 6c62e61..4f72ba2 100644 --- a/core/res/res/anim/task_open_enter.xml +++ b/core/res/res/anim/task_open_enter.xml @@ -22,9 +22,13 @@ <scale android:fromXScale="1.0" android:toXScale="1.0" android:fromYScale="0.9" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="50%p" + android:fillEnabled="true" android:fillBefore="true" android:interpolator="@anim/decelerate_quint_interpolator" + android:startOffset="@android:integer/config_mediumAnimTime" android:duration="@android:integer/config_mediumAnimTime" /> <alpha android:fromAlpha="0" android:toAlpha="1.0" + android:fillEnabled="true" android:fillBefore="true" android:interpolator="@anim/decelerate_cubic_interpolator" + android:startOffset="@android:integer/config_mediumAnimTime" android:duration="@android:integer/config_mediumAnimTime"/> </set> diff --git a/core/res/res/anim/task_open_exit.xml b/core/res/res/anim/task_open_exit.xml index 3c971da..6174151 100644 --- a/core/res/res/anim/task_open_exit.xml +++ b/core/res/res/anim/task_open_exit.xml @@ -18,8 +18,19 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false"> - <!-- Do nothing. --> + android:detachWallpaper="true" android:shareInterpolator="false"> + <scale android:fromXScale="1.0" android:toXScale="1.0" + android:fromYScale="1.0" android:toYScale="0.9" + android:pivotX="50%p" android:pivotY="50%p" + android:fillEnabled="true" android:fillAfter="true" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_mediumAnimTime" /> + <alpha android:fromAlpha="1.0" android:toAlpha="0" + android:fillEnabled="true" android:fillAfter="true" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_mediumAnimTime"/> + <!-- This is just to keep the animation running for the entire duration. --> <alpha android:fromAlpha="1.0" android:toAlpha="1.0" + android:startOffset="@android:integer/config_mediumAnimTime" android:duration="@android:integer/config_mediumAnimTime"/> </set> |