diff options
author | Ari Sachter-Zeltzer <asz@google.com> | 2014-06-06 18:31:18 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2014-06-06 19:48:36 -0700 |
commit | 7e3357a56d10bdf9a12f8ce583982f9b8ab5f0de (patch) | |
tree | 3c0e5ff81f6cbbc0f01c684725b1b1a7c374636b /core/res/res/anim | |
parent | 2f98a26bbf24fdc40ef53a653bb152c7f5a5d0dd (diff) | |
download | frameworks_base-7e3357a56d10bdf9a12f8ce583982f9b8ab5f0de.zip frameworks_base-7e3357a56d10bdf9a12f8ce583982f9b8ab5f0de.tar.gz frameworks_base-7e3357a56d10bdf9a12f8ce583982f9b8ab5f0de.tar.bz2 |
[system transitions]
+ merge all transition work into new branch for commiting to master
+ new task switching animations to support doc-centric recents
+ new default activity transitions
+ new app -> home (wallpaper close)
+ updated fragment close
Change-Id: If055e454e7e7bf11c7d54c8cacad8f7ec52d12d1
Diffstat (limited to 'core/res/res/anim')
-rw-r--r-- | core/res/res/anim/activity_close_enter.xml | 5 | ||||
-rw-r--r-- | core/res/res/anim/activity_close_exit.xml | 16 | ||||
-rw-r--r-- | core/res/res/anim/activity_open_enter.xml | 15 | ||||
-rw-r--r-- | core/res/res/anim/activity_open_exit.xml | 6 | ||||
-rw-r--r-- | core/res/res/anim/task_close_enter.xml | 24 | ||||
-rw-r--r-- | core/res/res/anim/task_close_exit.xml | 18 | ||||
-rw-r--r-- | core/res/res/anim/task_open_enter.xml | 16 | ||||
-rw-r--r-- | core/res/res/anim/task_open_exit.xml | 20 | ||||
-rw-r--r-- | core/res/res/anim/wallpaper_open_enter.xml | 2 | ||||
-rw-r--r-- | core/res/res/anim/wallpaper_open_exit.xml | 28 |
10 files changed, 71 insertions, 79 deletions
diff --git a/core/res/res/anim/activity_close_enter.xml b/core/res/res/anim/activity_close_enter.xml index 84e4a19..a67b0ca 100644 --- a/core/res/res/anim/activity_close_enter.xml +++ b/core/res/res/anim/activity_close_enter.xml @@ -18,7 +18,8 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal"> - <alpha android:fromAlpha="1.0" android:toAlpha="1.0" + <alpha android:fromAlpha="0.7" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="300"/> + android:interpolator="@interpolator/linear_out_slow_in" + android:duration="250"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_close_exit.xml b/core/res/res/anim/activity_close_exit.xml index 32f6d38..52c3adf 100644 --- a/core/res/res/anim/activity_close_exit.xml +++ b/core/res/res/anim/activity_close_exit.xml @@ -20,13 +20,13 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false" android:zAdjustment="top"> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:interpolator="@interpolator/decelerate_cubic" + android:interpolator="@interpolator/accelerate_quart" + android:fillEnabled="true" + android:fillBefore="false" android:fillAfter="true" + android:startOffset="100" + android:duration="150"/> + <translate android:fromYDelta="0%" android:toYDelta="5%" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="300"/> - <scale android:fromXScale="1.0" android:toXScale=".8" - android:fromYScale="1.0" android:toYScale=".8" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@interpolator/decelerate_cubic" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="300"/> + android:interpolator="@interpolator/accelerate_quint" + android:duration="250"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml index d553bdf..1d949d2 100644 --- a/core/res/res/anim/activity_open_enter.xml +++ b/core/res/res/anim/activity_open_enter.xml @@ -21,15 +21,12 @@ android:shareInterpolator="false" android:zAdjustment="top"> <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:interpolator="@interpolator/decelerate_cubic" + android:interpolator="@interpolator/decelerate_quart" android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true" - android:duration="300"/> - <scale android:fromXScale=".8" android:toXScale="1.0" - android:fromYScale=".8" android:toYScale="1.0" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@interpolator/decelerate_cubic" - android:fillEnabled="true" - android:fillBefore="false" android:fillAfter="true" - android:duration="300"/> + android:duration="200"/> + <translate android:fromYDelta="8%" android:toYDelta="0" + android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:interpolator="@interpolator/decelerate_quint" + android:duration="350"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml index 2d105d1..3a84197 100644 --- a/core/res/res/anim/activity_open_exit.xml +++ b/core/res/res/anim/activity_open_exit.xml @@ -19,8 +19,8 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:background="#ff000000" android:zAdjustment="normal"> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + <alpha android:fromAlpha="1.0" android:toAlpha="0.7" android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true" - android:interpolator="@interpolator/decelerate_quint" - android:duration="300"/> + android:interpolator="@interpolator/fast_out_slow_in" + android:duration="217"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/task_close_enter.xml b/core/res/res/anim/task_close_enter.xml index 9a747a1..b07f470 100644 --- a/core/res/res/anim/task_close_enter.xml +++ b/core/res/res/anim/task_close_enter.xml @@ -18,25 +18,25 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top"> + android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal"> - <alpha android:fromAlpha="0" android:toAlpha="1.0" + <alpha android:fromAlpha="0.6" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/decelerate_quad" - android:startOffset="300" - android:duration="400"/> + android:interpolator="@interpolator/decelerate_cubic" + android:startOffset="600" + android:duration="133"/> - <translate android:fromYDelta="-120%" android:toYDelta="0" + <translate android:fromYDelta="10%" android:toYDelta="0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/decelerate_quint" + android:interpolator="@interpolator/decelerate_cubic" android:startOffset="300" - android:duration="400" /> + android:duration="433" /> - <scale android:fromXScale=".5" android:toXScale="1.0" - android:fromYScale=".5" android:toYScale="1.0" + <scale android:fromXScale=".9" android:toXScale="1.0" + android:fromYScale=".9" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="0%p" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/decelerate_quad" + android:interpolator="@interpolator/fast_out_slow_in" android:startOffset="300" - android:duration="400" /> + android:duration="433" /> </set>
\ No newline at end of file diff --git a/core/res/res/anim/task_close_exit.xml b/core/res/res/anim/task_close_exit.xml index 35b1aa3..d23c74f 100644 --- a/core/res/res/anim/task_close_exit.xml +++ b/core/res/res/anim/task_close_exit.xml @@ -18,24 +18,18 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal"> + android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top"> <alpha android:fromAlpha="1.0" android:toAlpha="0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/accelerate_quad" - android:duration="300"/> + android:startOffset="250" + android:duration="167"/> - <translate android:fromYDelta="0" android:toYDelta="120%" + <translate android:fromYDelta="0" android:toYDelta="110%" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/accelerate_cubic" - android:duration="300"/> - - <scale android:fromXScale="1.0" android:toXScale="0.5" - android:fromYScale="1.0" android:toYScale="0.5" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:pivotX="50%p" android:pivotY="100%p" - android:interpolator="@interpolator/accelerate_quad" - android:duration="300" /> + android:interpolator="@interpolator/accelerate_quint" + android:duration="417"/> <!-- This is needed to keep the animation running while task_open_enter completes --> <alpha android:fromAlpha="1.0" android:toAlpha="1.0" diff --git a/core/res/res/anim/task_open_enter.xml b/core/res/res/anim/task_open_enter.xml index 5e4ae18..8321ea4 100644 --- a/core/res/res/anim/task_open_enter.xml +++ b/core/res/res/anim/task_open_enter.xml @@ -22,21 +22,13 @@ <alpha android:fromAlpha="0" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/decelerate_quad" + android:interpolator="@interpolator/decelerate_quart" android:startOffset="300" - android:duration="400"/> + android:duration="167"/> - <translate android:fromYDelta="120%" android:toYDelta="0" + <translate android:fromYDelta="110%" android:toYDelta="0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/decelerate_quint" android:startOffset="300" - android:duration="400" /> - - <scale android:fromXScale=".5" android:toXScale="1.0" - android:fromYScale=".5" android:toYScale="1.0" - android:pivotX="50%p" android:pivotY="100%p" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/decelerate_quad" - android:startOffset="300" - android:duration="400" /> + android:duration="417" /> </set>
\ No newline at end of file diff --git a/core/res/res/anim/task_open_exit.xml b/core/res/res/anim/task_open_exit.xml index 0ba35d7..78d0fb0 100644 --- a/core/res/res/anim/task_open_exit.xml +++ b/core/res/res/anim/task_open_exit.xml @@ -20,22 +20,22 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal"> - <alpha android:fromAlpha="1.0" android:toAlpha="0" + <alpha android:fromAlpha="1.0" android:toAlpha="0.6" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/accelerate_quad" - android:duration="300"/> + android:interpolator="@interpolator/accelerate_cubic" + android:duration="133"/> - <translate android:fromYDelta="0" android:toYDelta="-120%" + <translate android:fromYDelta="0" android:toYDelta="10%" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/accelerate_cubic" - android:duration="300"/> + android:duration="433"/> - <scale android:fromXScale="1.0" android:toXScale="0.5" - android:fromYScale="1.0" android:toYScale="0.5" + <scale android:fromXScale="1.0" android:toXScale="0.9" + android:fromYScale="1.0" android:toYScale="0.9" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:pivotX="50%p" android:pivotY="0%p" - android:interpolator="@interpolator/accelerate_quad" - android:duration="300" /> + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@interpolator/fast_out_slow_in" + android:duration="433" /> <!-- This is needed to keep the animation running while task_open_enter completes --> <alpha android:fromAlpha="1.0" android:toAlpha="1.0" diff --git a/core/res/res/anim/wallpaper_open_enter.xml b/core/res/res/anim/wallpaper_open_enter.xml index 12a1bdf..e70f0e7 100644 --- a/core/res/res/anim/wallpaper_open_enter.xml +++ b/core/res/res/anim/wallpaper_open_enter.xml @@ -21,5 +21,5 @@ android:detachWallpaper="true" android:shareInterpolator="false" android:zAdjustment="normal"> <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="375"/> + android:duration="225"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/wallpaper_open_exit.xml b/core/res/res/anim/wallpaper_open_exit.xml index b0f97d1..696912b 100644 --- a/core/res/res/anim/wallpaper_open_exit.xml +++ b/core/res/res/anim/wallpaper_open_exit.xml @@ -19,14 +19,22 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false" android:zAdjustment="top"> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:interpolator="@interpolator/accelerate_decelerate" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="200" /> - <scale android:fromXScale="1.0" android:toXScale="0.5" - android:fromYScale="1.0" android:toYScale="0.5" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@interpolator/decelerate_quad" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="375" /> + + <alpha android:fromAlpha="1.0" android:toAlpha="0" + android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:interpolator="@interpolator/accelerate_quad" + android:startOffset="250" + android:duration="167"/> + + <translate android:fromYDelta="0" android:toYDelta="110%" + android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:interpolator="@interpolator/fast_out_linear_in" + android:duration="225"/> + + <scale android:fromXScale="1.0" android:toXScale="1.0" + android:fromYScale="1.0" android:toYScale="1.0" + android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@interpolator/fast_out_slow_in" + android:duration="225" /> </set>
\ No newline at end of file |