diff options
| -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 | ||||
| -rw-r--r-- | core/res/res/animator/fragment_open_enter.xml | 4 | ||||
| -rw-r--r-- | core/res/res/interpolator/accelerate_quart.xml | 21 | ||||
| -rw-r--r-- | core/res/res/interpolator/decelerate_quart.xml | 21 |
13 files changed, 115 insertions, 81 deletions
diff --git a/core/res/res/anim/activity_close_enter.xml b/core/res/res/anim/activity_close_enter.xml index 84e4a19a23c7..a67b0ca38519 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 32f6d3845edf..52c3adf10b4e 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 d553bdfc98ef..1d949d2f7446 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 2d105d185baa..3a84197f8f63 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 9a747a122dd2..b07f470dd5f5 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 35b1aa37838c..d23c74ffc160 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 5e4ae1874ec6..8321ea4ad8d5 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 0ba35d72f766..78d0fb015ce3 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 12a1bdfc202f..e70f0e7d54b5 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 b0f97d166c8a..696912b257ac 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 diff --git a/core/res/res/animator/fragment_open_enter.xml b/core/res/res/animator/fragment_open_enter.xml index 8cd0e4e7e668..4ae24b9e07dd 100644 --- a/core/res/res/animator/fragment_open_enter.xml +++ b/core/res/res/animator/fragment_open_enter.xml @@ -19,13 +19,13 @@ <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator android:interpolator="@interpolator/decelerate_cubic" - android:valueFrom="0.8" android:valueTo="1.0" + android:valueFrom="0.95" android:valueTo="1.0" android:valueType="floatType" android:propertyName="scaleY" android:duration="300"/> <objectAnimator android:interpolator="@interpolator/decelerate_cubic" - android:valueFrom="0.8" android:valueTo="1.0" + android:valueFrom="0.95" android:valueTo="1.0" android:valueType="floatType" android:propertyName="scaleX" android:duration="300"/> diff --git a/core/res/res/interpolator/accelerate_quart.xml b/core/res/res/interpolator/accelerate_quart.xml new file mode 100644 index 000000000000..64efec6fd19a --- /dev/null +++ b/core/res/res/interpolator/accelerate_quart.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<accelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:factor="2.0" /> diff --git a/core/res/res/interpolator/decelerate_quart.xml b/core/res/res/interpolator/decelerate_quart.xml new file mode 100644 index 000000000000..9f6a51fd9da8 --- /dev/null +++ b/core/res/res/interpolator/decelerate_quart.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:factor="2.0" /> |