diff options
38 files changed, 300 insertions, 442 deletions
diff --git a/core/res/res/anim/activity_close_enter.xml b/core/res/res/anim/activity_close_enter.xml index 3c971da..82d990c 100644 --- a/core/res/res/anim/activity_close_enter.xml +++ b/core/res/res/anim/activity_close_enter.xml @@ -18,8 +18,14 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="normal" android:shareInterpolator="false"> - <!-- Do nothing. --> - <alpha android:fromAlpha="1.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime"/> + <scale android:fromXScale="0.98" android:toXScale="1.0" + android:fromYScale="0.98" android:toYScale="1.0" + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:fromAlpha=".75" android:toAlpha="1.0" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur"/> </set> diff --git a/core/res/res/anim/activity_close_exit.xml b/core/res/res/anim/activity_close_exit.xml index 2001e20..13768b5 100644 --- a/core/res/res/anim/activity_close_exit.xml +++ b/core/res/res/anim/activity_close_exit.xml @@ -18,13 +18,15 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="top" android:shareInterpolator="false"> - <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale="0.9" + <scale android:fromXScale="1.0" android:toXScale="1.04" + android:fromYScale="1.0" android:toYScale="1.04" android:pivotX="50%p" android:pivotY="50%p" 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:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur"/> + </set> diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml index 6c62e61..4841910 100644 --- a/core/res/res/anim/activity_open_enter.xml +++ b/core/res/res/anim/activity_open_enter.xml @@ -18,13 +18,15 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="top" android:shareInterpolator="false"> - <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="0.9" android:toYScale="1.0" + <scale android:fromXScale="1.04" android:toXScale="1.0" + android:fromYScale="1.04" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="50%p" android:interpolator="@anim/decelerate_quint_interpolator" - android:duration="@android:integer/config_mediumAnimTime" /> - <alpha android:fromAlpha="0" android:toAlpha="1.0" - android:interpolator="@anim/decelerate_cubic_interpolator" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur"/> + </set> diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml index 3c971da..81e902f 100644 --- a/core/res/res/anim/activity_open_exit.xml +++ b/core/res/res/anim/activity_open_exit.xml @@ -18,8 +18,15 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="normal" android:shareInterpolator="false"> - <!-- Do nothing. --> - <alpha android:fromAlpha="1.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime"/> + <scale android:fromXScale="1.0" android:toXScale="0.98" + android:fromYScale="1.0" android:toYScale="0.98" + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:fromAlpha="1.0" android:toAlpha="0.75" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur"/> + </set> diff --git a/core/res/res/anim/dialog_enter.xml b/core/res/res/anim/dialog_enter.xml index d4983c6..82bfdf6 100644 --- a/core/res/res/anim/dialog_enter.xml +++ b/core/res/res/anim/dialog_enter.xml @@ -18,11 +18,13 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> + android:shareInterpolator="false" > <scale android:fromXScale="0.9" android:toXScale="1.0" android:fromYScale="0.9" android:toYScale="1.0" android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur" /> <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="@android:integer/config_activityShortDur" /> </set> diff --git a/core/res/res/anim/dialog_exit.xml b/core/res/res/anim/dialog_exit.xml index 2aa629a..829c619 100644 --- a/core/res/res/anim/dialog_exit.xml +++ b/core/res/res/anim/dialog_exit.xml @@ -18,11 +18,13 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/accelerate_interpolator"> + android:shareInterpolator="false" > <scale android:fromXScale="1.0" android:toXScale="0.9" - android:fromYScale="1.0" android:toYScale="0.9" - android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> + android:fromYScale="1.0" android:toYScale="0.9" + android:pivotX="50%" android:pivotY="50%" + android:interpolator="@anim/decelerate_quint_interpolator" + android:duration="@android:integer/config_activityDefaultDur" /> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime"/> + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="@android:integer/config_activityShortDur"/> </set> diff --git a/core/res/res/anim/fragment_close_enter.xml b/core/res/res/anim/fragment_close_enter.xml index 1c170e3..c1b564b 100644 --- a/core/res/res/anim/fragment_close_enter.xml +++ b/core/res/res/anim/fragment_close_enter.xml @@ -16,12 +16,29 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="normal"> + + <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="0.98" + android:valueTo="1.0" + android:valueType="floatType" + android:propertyName="scaleY" + android:duration="@android:integer/config_activityDefaultDur"/> + <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="0.98" + android:valueTo="1.0" + android:valueType="floatType" + android:propertyName="scaleX" + android:duration="@android:integer/config_activityDefaultDur"/> <objectAnimator android:interpolator="@anim/decelerate_cubic_interpolator" - android:valueFrom="0" - android:valueTo="1" + android:valueFrom="0.0" + android:valueTo="1.0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityDefaultDur"/> + </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_close_exit.xml b/core/res/res/anim/fragment_close_exit.xml index a084d63..2ce358f 100644 --- a/core/res/res/anim/fragment_close_exit.xml +++ b/core/res/res/anim/fragment_close_exit.xml @@ -16,19 +16,28 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="top"> <objectAnimator - android:interpolator="@anim/decelerate_cubic_interpolator" - android:valueFrom="1" - android:valueTo="0" + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="1.0" + android:valueTo="1.04" android:valueType="floatType" - android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> + android:propertyName="scaleY" + android:duration="@android:integer/config_activityDefaultDur"/> <objectAnimator android:interpolator="@anim/decelerate_quint_interpolator" - android:valueFrom="1" - android:valueTo=".8" + android:valueFrom="1.0" + android:valueTo="1.04" android:valueType="floatType" - android:propertyName="scaleY" - android:duration="@android:integer/config_mediumAnimTime"/> + android:propertyName="scaleX" + android:duration="@android:integer/config_activityDefaultDur"/> + <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" + android:valueFrom="1.0" + android:valueTo="0.0" + android:valueType="floatType" + android:propertyName="alpha" + android:duration="@android:integer/config_activityDefaultDur"/> + </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_next_enter.xml b/core/res/res/anim/fragment_next_enter.xml index d3ff7a6..63d3a45 100644 --- a/core/res/res/anim/fragment_next_enter.xml +++ b/core/res/res/anim/fragment_next_enter.xml @@ -16,19 +16,13 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="top"> <objectAnimator android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> - <objectAnimator - android:interpolator="@anim/decelerate_quint_interpolator" - android:valueFrom="50" - android:valueTo="0" - android:valueType="floatType" - android:propertyName="translationY" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityDefaultDur"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_next_exit.xml b/core/res/res/anim/fragment_next_exit.xml index e08804f..91e5786 100644 --- a/core/res/res/anim/fragment_next_exit.xml +++ b/core/res/res/anim/fragment_next_exit.xml @@ -16,19 +16,13 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="normal"> <objectAnimator android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> - <objectAnimator - android:interpolator="@anim/decelerate_quint_interpolator" - android:valueFrom="0" - android:valueTo="-50" - android:valueType="floatType" - android:propertyName="translationY" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityShortDur"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_open_enter.xml b/core/res/res/anim/fragment_open_enter.xml index 9e625a9..e3bde46 100644 --- a/core/res/res/anim/fragment_open_enter.xml +++ b/core/res/res/anim/fragment_open_enter.xml @@ -18,17 +18,25 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator - android:interpolator="@anim/decelerate_cubic_interpolator" - android:valueFrom="0" - android:valueTo="1" + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="1.04" + android:valueTo="1.0" android:valueType="floatType" - android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> + android:propertyName="scaleY" + android:duration="@android:integer/config_activityDefaultDur"/> <objectAnimator android:interpolator="@anim/decelerate_quint_interpolator" - android:valueFrom=".8" - android:valueTo="1" + android:valueFrom="1.04" + android:valueTo="1.0" android:valueType="floatType" - android:propertyName="scaleY" - android:duration="@android:integer/config_mediumAnimTime"/> + android:propertyName="scaleX" + android:duration="@android:integer/config_activityDefaultDur"/> + <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" + android:valueFrom="0.0" + android:valueTo="1.0" + android:valueType="floatType" + android:propertyName="alpha" + android:duration="@android:integer/config_activityDefaultDur"/> + </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_open_exit.xml b/core/res/res/anim/fragment_open_exit.xml index d3278b2..b4c2194 100644 --- a/core/res/res/anim/fragment_open_exit.xml +++ b/core/res/res/anim/fragment_open_exit.xml @@ -18,10 +18,25 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="1.0" + android:valueTo="0.98" + android:valueType="floatType" + android:propertyName="scaleY" + android:duration="@android:integer/config_activityDefaultDur"/> + <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="1.0" + android:valueTo="0.98" + android:valueType="floatType" + android:propertyName="scaleX" + android:duration="@android:integer/config_activityDefaultDur"/> + <objectAnimator android:interpolator="@anim/decelerate_cubic_interpolator" - android:valueFrom="1" - android:valueTo="0" + android:valueFrom="1.0" + android:valueTo="0.0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityDefaultDur"/> + </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_prev_enter.xml b/core/res/res/anim/fragment_prev_enter.xml index 7ae41e6..63d3a45 100644 --- a/core/res/res/anim/fragment_prev_enter.xml +++ b/core/res/res/anim/fragment_prev_enter.xml @@ -16,19 +16,13 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="top"> <objectAnimator android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> - <objectAnimator - android:interpolator="@anim/decelerate_quint_interpolator" - android:valueFrom="-50" - android:valueTo="0" - android:valueType="floatType" - android:propertyName="translationY" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityDefaultDur"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_prev_exit.xml b/core/res/res/anim/fragment_prev_exit.xml index a41f1aa..91e5786 100644 --- a/core/res/res/anim/fragment_prev_exit.xml +++ b/core/res/res/anim/fragment_prev_exit.xml @@ -16,19 +16,13 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:zAdjustment="normal"> <objectAnimator android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_mediumAnimTime"/> - <objectAnimator - android:interpolator="@anim/decelerate_quint_interpolator" - android:valueFrom="0" - android:valueTo="50" - android:valueType="floatType" - android:propertyName="translationY" - android:duration="@android:integer/config_mediumAnimTime"/> + android:duration="@android:integer/config_activityShortDur"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/grow_fade_in.xml b/core/res/res/anim/grow_fade_in.xml index 5dc41cb..9180438 100644 --- a/core/res/res/anim/grow_fade_in.xml +++ b/core/res/res/anim/grow_fade_in.xml @@ -18,12 +18,13 @@ */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="0.3" android:toYScale="1.0" - android:pivotX="0%" android:pivotY="0%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha android:interpolator="@anim/decelerate_interpolator" +<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <scale android:interpolator="@anim/decelerate_quint_interpolator" + android:fromXScale="0.9" android:toXScale="1.0" + android:fromYScale="0.9" android:toYScale="1.0" + android:pivotX="50%" android:pivotY="0%" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:interpolator="@anim/decelerate_cubic_interpolator" android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> + android:duration="@android:integer/config_activityShortDur" /> </set> diff --git a/core/res/res/anim/grow_fade_in_center.xml b/core/res/res/anim/grow_fade_in_center.xml index c07a82e..09370e6 100644 --- a/core/res/res/anim/grow_fade_in_center.xml +++ b/core/res/res/anim/grow_fade_in_center.xml @@ -18,12 +18,13 @@ */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <scale android:fromXScale="0.6" android:toXScale="1.0" - android:fromYScale="0.6" android:toYScale="1.0" - android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha android:interpolator="@anim/decelerate_interpolator" +<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <scale android:interpolator="@anim/decelerate_quint_interpolator" + android:fromXScale="0.9" android:toXScale="1.0" + android:fromYScale="0.9" android:toYScale="1.0" + android:pivotX="50%" android:pivotY="50%" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:interpolator="@anim/decelerate_cubic_interpolator" android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> + android:duration="@android:integer/config_activityShortDur" /> </set> diff --git a/core/res/res/anim/grow_fade_in_from_bottom.xml b/core/res/res/anim/grow_fade_in_from_bottom.xml index 848c677..d1488e9 100644 --- a/core/res/res/anim/grow_fade_in_from_bottom.xml +++ b/core/res/res/anim/grow_fade_in_from_bottom.xml @@ -18,12 +18,13 @@ */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <scale android:fromXScale="0.5" android:toXScale="1.0" - android:fromYScale="0.5" android:toYScale="1.0" - android:pivotX="0%" android:pivotY="100%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha android:interpolator="@anim/decelerate_interpolator" +<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <scale android:interpolator="@anim/decelerate_quint_interpolator" + android:fromXScale="0.9" android:toXScale="1.0" + android:fromYScale="0.9" android:toYScale="1.0" + android:pivotX="50%" android:pivotY="100%" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:interpolator="@anim/decelerate_cubic_interpolator" android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> + android:duration="@android:integer/config_activityShortDur" /> </set> diff --git a/core/res/res/anim/input_method_enter.xml b/core/res/res/anim/input_method_enter.xml index 3858651..e02b310 100644 --- a/core/res/res/anim/input_method_enter.xml +++ b/core/res/res/anim/input_method_enter.xml @@ -19,9 +19,11 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <translate android:fromYDelta="20%" android:toYDelta="0" + android:shareInterpolator="false"> + <translate android:fromYDelta="10%" android:toYDelta="0" + android:interpolator="@anim/decelerate_quint_interpolator" android:duration="@android:integer/config_shortAnimTime"/> <alpha android:fromAlpha="0.5" android:toAlpha="1.0" + android:interpolator="@anim/decelerate_cubic_interpolator" android:duration="@android:integer/config_shortAnimTime" /> </set> diff --git a/core/res/res/anim/input_method_exit.xml b/core/res/res/anim/input_method_exit.xml index 25369ab..e155f97 100644 --- a/core/res/res/anim/input_method_exit.xml +++ b/core/res/res/anim/input_method_exit.xml @@ -18,9 +18,11 @@ */ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/accelerate_interpolator"> - <translate android:fromYDelta="0" android:toYDelta="20%" + android:shareInterpolator="false"> + <translate android:fromYDelta="0" android:toYDelta="10%" + android:interpolator="@anim/accelerate_quint_interpolator" android:duration="@android:integer/config_shortAnimTime"/> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:interpolator="@anim/accelerate_cubic_interpolator" android:duration="@android:integer/config_shortAnimTime"/> </set> diff --git a/core/res/res/anim/lock_screen_behind_enter.xml b/core/res/res/anim/lock_screen_behind_enter.xml index b243223..0bfe806 100644 --- a/core/res/res/anim/lock_screen_behind_enter.xml +++ b/core/res/res/anim/lock_screen_behind_enter.xml @@ -17,7 +17,7 @@ */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_interpolator"> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_cubic_interpolator"> <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_longAnimTime" /> + android:duration="@android:integer/config_activityDefaultDur" /> </set> diff --git a/core/res/res/anim/lock_screen_enter.xml b/core/res/res/anim/lock_screen_enter.xml index dd47ff8..0a169fd 100644 --- a/core/res/res/anim/lock_screen_enter.xml +++ b/core/res/res/anim/lock_screen_enter.xml @@ -18,7 +18,7 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> + android:interpolator="@anim/accelerate_cubic_interpolator"> <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> + android:duration="@android:integer/config_activityDefaultDur" /> </set> diff --git a/core/res/res/anim/lock_screen_exit.xml b/core/res/res/anim/lock_screen_exit.xml index 077fc6b..f06a6e5 100644 --- a/core/res/res/anim/lock_screen_exit.xml +++ b/core/res/res/anim/lock_screen_exit.xml @@ -18,7 +18,7 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/accelerate_interpolator"> + android:interpolator="@anim/decelerate_cubic_interpolator"> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_longAnimTime" /> + android:duration="@android:integer/config_activityDefaultDur" /> </set> diff --git a/core/res/res/anim/shrink_fade_out.xml b/core/res/res/anim/shrink_fade_out.xml index 4000c23..7229a17 100644 --- a/core/res/res/anim/shrink_fade_out.xml +++ b/core/res/res/anim/shrink_fade_out.xml @@ -17,12 +17,14 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale="0.3" - android:pivotX="0%" android:pivotY="0%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha android:interpolator="@anim/accelerate_interpolator" + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <scale android:interpolator="@anim/decelerate_quint_interpolator" + android:fromXScale="1.0" android:toXScale="0.9" + android:fromYScale="1.0" android:toYScale="0.9" + android:pivotX="50%" android:pivotY="0%" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:interpolator="@anim/decelerate_cubic_interpolator" android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime"/> -</set> + android:duration="@android:integer/config_activityShortDur" /> +</set>
\ No newline at end of file diff --git a/core/res/res/anim/shrink_fade_out_center.xml b/core/res/res/anim/shrink_fade_out_center.xml index a41731e..23fa0b0 100644 --- a/core/res/res/anim/shrink_fade_out_center.xml +++ b/core/res/res/anim/shrink_fade_out_center.xml @@ -17,12 +17,14 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <scale android:fromXScale="1.0" android:toXScale="0.5" - android:fromYScale="1.0" android:toYScale="0.5" - android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha android:interpolator="@anim/accelerate_interpolator" + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <scale android:interpolator="@anim/decelerate_quint_interpolator" + android:fromXScale="1.0" android:toXScale="0.9" + android:fromYScale="1.0" android:toYScale="0.9" + android:pivotX="50%" android:pivotY="50%" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:interpolator="@anim/decelerate_cubic_interpolator" android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime"/> -</set> + android:duration="@android:integer/config_activityShortDur" /> +</set>
\ No newline at end of file diff --git a/core/res/res/anim/shrink_fade_out_from_bottom.xml b/core/res/res/anim/shrink_fade_out_from_bottom.xml index 345a2e0..0639425 100644 --- a/core/res/res/anim/shrink_fade_out_from_bottom.xml +++ b/core/res/res/anim/shrink_fade_out_from_bottom.xml @@ -17,12 +17,14 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale="0.3" - android:pivotX="0%" android:pivotY="100%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha android:interpolator="@anim/accelerate_interpolator" + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <scale android:interpolator="@anim/decelerate_quint_interpolator" + android:fromXScale="1.0" android:toXScale="0.9" + android:fromYScale="1.0" android:toYScale="0.9" + android:pivotX="50%" android:pivotY="100%" + android:duration="@android:integer/config_activityDefaultDur" /> + <alpha android:interpolator="@anim/decelerate_cubic_interpolator" android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime"/> -</set> + android:duration="@android:integer/config_activityShortDur" /> +</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 9bec8a3..5057eed 100644 --- a/core/res/res/anim/task_close_enter.xml +++ b/core/res/res/anim/task_close_enter.xml @@ -19,16 +19,16 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:detachWallpaper="true" android:shareInterpolator="false"> - <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="0.9" android:toYScale="1.0" + <scale android:fromXScale="1.0" android:toXScale="1.0" + android:fromYScale="0.95" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="50%p" - android:fillEnabled="true" android:fillBefore="true" + 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:startOffset="300" + android:duration="300" /> + <alpha android:fromAlpha="0" android:toAlpha="1.0" android:interpolator="@anim/decelerate_cubic_interpolator" - android:startOffset="@android:integer/config_mediumAnimTime" - android:duration="@android:integer/config_mediumAnimTime"/> + android:fillEnabled="true" android:fillBefore="true" + android:startOffset="300" + android:duration="300"/> </set> diff --git a/core/res/res/anim/task_close_exit.xml b/core/res/res/anim/task_close_exit.xml index ca60214..169f846 100644 --- a/core/res/res/anim/task_close_exit.xml +++ b/core/res/res/anim/task_close_exit.xml @@ -18,19 +18,15 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false"> + android:detachWallpaper="true" android:shareInterpolator="false"> <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale="0.9" + android:fillEnabled="true" android:fillAfter="true" + android:fromYScale="1.0" android:toYScale="0.0" 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" /> + android:interpolator="@anim/linear_interpolator" + android:duration="300" /> <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"/> + android:fillEnabled="true" android:fillAfter="true" + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="150"/> </set> diff --git a/core/res/res/anim/task_open_enter.xml b/core/res/res/anim/task_open_enter.xml index 4f72ba2..8f8515a 100644 --- a/core/res/res/anim/task_open_enter.xml +++ b/core/res/res/anim/task_open_enter.xml @@ -20,15 +20,15 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="0.9" android:toYScale="1.0" + android:fromYScale="0.95" 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" /> + android:startOffset="300" + android:duration="300" /> <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"/> + android:interpolator="@anim/decelerate_quint_interpolator" + android:startOffset="300" + android:duration="300"/> </set> diff --git a/core/res/res/anim/task_open_exit.xml b/core/res/res/anim/task_open_exit.xml index 6174151..7d2b1b1 100644 --- a/core/res/res/anim/task_open_exit.xml +++ b/core/res/res/anim/task_open_exit.xml @@ -20,17 +20,13 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:detachWallpaper="true" android:shareInterpolator="false"> <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale="0.9" + android:fromYScale="1.0" android:toYScale="0.0" 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" /> + android:interpolator="@anim/linear_interpolator" + android:duration="300" /> <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> + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="150"/> +</set>
\ No newline at end of file diff --git a/core/res/res/anim/wallpaper_close_enter.xml b/core/res/res/anim/wallpaper_close_enter.xml index 760acb3..1ce0738 100644 --- a/core/res/res/anim/wallpaper_close_enter.xml +++ b/core/res/res/anim/wallpaper_close_enter.xml @@ -17,7 +17,6 @@ */ --> -<!-- New holo animation, zooming contents on top of wallpaper down. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> <scale android:fromXScale="1.0" android:toXScale="1.0" @@ -25,64 +24,11 @@ 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" /> + android:startOffset="200" + android:duration="300" /> <alpha android:fromAlpha="0" android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:interpolator="@anim/decelerate_quint_interpolator" - android:startOffset="@android:integer/config_mediumAnimTime" - android:duration="@android:integer/config_mediumAnimTime"/> + android:startOffset="200" + android:duration="300"/> </set> - -<!-- 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: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:interpolator="@anim/accelerate_decelerate_interpolator" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> - -<!-- This version zooms the new non-wallpaper down on top 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="2.0" android:toXScale="1.0" - android:fromYScale="2.0" android:toYScale="1.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> - <alpha android:fromAlpha="0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> - -<!-- This version zooms the new non-wallpaper down on top of the - wallpaper. --> -<!-- -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <scale android:fromXScale="2.0" android:toXScale="1.0" - android:fromYScale="2.0" android:toYScale="1.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> -</set> ---> - -<!-- This version is a variation on the inter-activity slide that - also scales the wallpaper. --> -<!-- -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <translate android:fromXDelta="33%" android:toXDelta="0" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> diff --git a/core/res/res/anim/wallpaper_close_exit.xml b/core/res/res/anim/wallpaper_close_exit.xml index b804916..39af5f9 100644 --- a/core/res/res/anim/wallpaper_close_exit.xml +++ b/core/res/res/anim/wallpaper_close_exit.xml @@ -17,77 +17,16 @@ */ --> -<!-- New holo animation, zooming contents on top of wallpaper down. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:detachWallpaper="true" android:shareInterpolator="false"> - <scale android:fromXScale="1.0" android:toXScale="0.8" - android:fromYScale="1.0" android:toYScale="0.8" + <scale android:fromXScale="1.0" android:toXScale="0.9" + 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" /> + android:duration="300" /> <alpha android:fromAlpha="1.0" android:toAlpha="0" android:fillEnabled="true" android:fillAfter="true" android:interpolator="@anim/decelerate_cubic_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"/> + android:duration="150"/> </set> - -<!-- 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:detachWallpaper="true"> - <scale android:fromXScale="1.0" android:toXScale="2.0" - android:fromYScale="1.0" android:toYScale="2.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> -</set> ---> - -<!-- This version zooms the new non-wallpaper down on top of the - wallpaper, without zooming the wallpaper itself. --> -<!-- -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator" - android:detachWallpaper="true"> - <scale android:fromXScale="1.0" android:toXScale=".5" - android:fromYScale="1.0" android:toYScale=".5" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> -</set> ---> - -<!-- This version zooms the new non-wallpaper down on top of the - wallpaper. The wallpaper here just stays fixed behind. --> -<!-- -<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:duration="@android:integer/config_mediumAnimTime" /> - <alpha android:fromAlpha="1.0" android:toAlpha="0" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> - -<!-- This version is a variation on the inter-activity slide that - also scales the wallpaper. --> -<!-- -<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="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="-100%" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> diff --git a/core/res/res/anim/wallpaper_intra_close_enter.xml b/core/res/res/anim/wallpaper_intra_close_enter.xml index 73bf9a3..1ce0738 100644 --- a/core/res/res/anim/wallpaper_intra_close_enter.xml +++ b/core/res/res/anim/wallpaper_intra_close_enter.xml @@ -18,8 +18,17 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator" - android:zAdjustment="top"> - <alpha android:fromAlpha="0.5" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> + android:shareInterpolator="false"> + <scale android:fromXScale="1.0" android:toXScale="1.0" + android:fromYScale=".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="200" + android:duration="300" /> + <alpha android:fromAlpha="0" android:toAlpha="1.0" + android:fillEnabled="true" android:fillBefore="true" + android:interpolator="@anim/decelerate_quint_interpolator" + android:startOffset="200" + android:duration="300"/> </set> diff --git a/core/res/res/anim/wallpaper_intra_close_exit.xml b/core/res/res/anim/wallpaper_intra_close_exit.xml index d43660e..39af5f9 100644 --- a/core/res/res/anim/wallpaper_intra_close_exit.xml +++ b/core/res/res/anim/wallpaper_intra_close_exit.xml @@ -18,7 +18,15 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <alpha android:fromAlpha="0.5" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime"/> + android:detachWallpaper="true" android:shareInterpolator="false"> + <scale android:fromXScale="1.0" android:toXScale="0.9" + 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="300" /> + <alpha android:fromAlpha="1.0" android:toAlpha="0" + android:fillEnabled="true" android:fillAfter="true" + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="150"/> </set> diff --git a/core/res/res/anim/wallpaper_intra_open_enter.xml b/core/res/res/anim/wallpaper_intra_open_enter.xml index c85ca4c..0a8b7d2 100644 --- a/core/res/res/anim/wallpaper_intra_open_enter.xml +++ b/core/res/res/anim/wallpaper_intra_open_enter.xml @@ -18,7 +18,15 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <alpha android:fromAlpha="0.5" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> + android:detachWallpaper="true" android:shareInterpolator="false"> + <scale android:fromXScale="0.95" android:toXScale="1.0" + android:fromYScale="0.95" android:toYScale="1.0" + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/decelerate_quint_interpolator" + android:startOffset="200" + android:duration="300" /> + <alpha android:fromAlpha="0" android:toAlpha="1.0" + android:interpolator="@anim/decelerate_cubic_interpolator" + android:startOffset="200" + android:duration="300"/> </set> diff --git a/core/res/res/anim/wallpaper_intra_open_exit.xml b/core/res/res/anim/wallpaper_intra_open_exit.xml index eaeac22..d55ee6e 100644 --- a/core/res/res/anim/wallpaper_intra_open_exit.xml +++ b/core/res/res/anim/wallpaper_intra_open_exit.xml @@ -18,8 +18,13 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator" - android:zAdjustment="top"> - <alpha android:fromAlpha="0.5" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime"/> -</set> + android:shareInterpolator="false"> + <scale android:fromXScale="1.0" android:toXScale="1.0" + android:fromYScale="1.0" android:toYScale="0.0" + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/linear_interpolator" + android:duration="300" /> + <alpha android:fromAlpha="1.0" android:toAlpha="0" + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="160"/> +</set> diff --git a/core/res/res/anim/wallpaper_open_enter.xml b/core/res/res/anim/wallpaper_open_enter.xml index 72ac671..0a8b7d2 100644 --- a/core/res/res/anim/wallpaper_open_enter.xml +++ b/core/res/res/anim/wallpaper_open_enter.xml @@ -17,74 +17,16 @@ */ --> -<!-- New holo animation, zooming contents on top of wallpaper back up. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:detachWallpaper="true" android:shareInterpolator="false"> - <scale android:fromXScale="0.8" android:toXScale="1.0" - android:fromYScale="0.8" android:toYScale="1.0" + <scale android:fromXScale="0.95" android:toXScale="1.0" + android:fromYScale="0.95" android:toYScale="1.0" android:pivotX="50%p" android:pivotY="50%p" android:interpolator="@anim/decelerate_quint_interpolator" - android:startOffset="@android:integer/config_mediumAnimTime" - android:duration="@android:integer/config_mediumAnimTime" /> + android:startOffset="200" + android:duration="300" /> <alpha android:fromAlpha="0" android:toAlpha="1.0" android:interpolator="@anim/decelerate_cubic_interpolator" - android:startOffset="@android:integer/config_mediumAnimTime" - android:duration="@android:integer/config_mediumAnimTime"/> + android:startOffset="200" + android:duration="300"/> </set> - - -<!-- 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:detachWallpaper="true"> - <scale android:fromXScale="2.0" android:toXScale="1.0" - android:fromYScale="2.0" android:toYScale="1.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> -</set> ---> - -<!-- This version zooms the new non-wallpaper down on top of the - wallpaper, without zooming the wallpaper itself. --> -<!-- -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator" - android:detachWallpaper="true"> - <scale android:fromXScale=".5" android:toXScale="1.0" - android:fromYScale=".5" android:toYScale="1.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> -</set> ---> - -<!-- This version zooms the new non-wallpaper up off the wallpaper the - wallpaper. The wallpaper here just stays fixed behind. --> -<!-- -<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:duration="@android:integer/config_mediumAnimTime" /> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> - -<!-- This version is a variation on the inter-activity slide that - also scales the wallpaper. --> -<!-- -<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="-100%" android:toXDelta="0" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> diff --git a/core/res/res/anim/wallpaper_open_exit.xml b/core/res/res/anim/wallpaper_open_exit.xml index 7df3563..d55ee6e 100644 --- a/core/res/res/anim/wallpaper_open_exit.xml +++ b/core/res/res/anim/wallpaper_open_exit.xml @@ -17,68 +17,14 @@ */ --> -<!-- New holo animation, zooming contents on top of wallpaper back up. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> <scale android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale=".9" + android:fromYScale="1.0" android:toYScale="0.0" android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@anim/decelerate_quint_interpolator" - android:duration="@android:integer/config_mediumAnimTime" /> + android:interpolator="@anim/linear_interpolator" + android:duration="300" /> <alpha android:fromAlpha="1.0" android:toAlpha="0" - android:interpolator="@anim/decelerate_quint_interpolator" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> - -<!-- 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: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> ---> - -<!-- This version zooms the new non-wallpaper down on top 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="1.0" android:toXScale="2.0" - android:fromYScale="1.0" android:toYScale="2.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> - <alpha android:fromAlpha="1.0" android:toAlpha="0" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> - -<!-- This version zooms the new non-wallpaper down on top of the - wallpaper. --> -<!-- -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <scale android:fromXScale="1.0" android:toXScale="2.0" - android:fromYScale="1.0" android:toYScale="2.0" - android:pivotX="50%p" android:pivotY="50%p" - android:duration="@android:integer/config_mediumAnimTime" /> -</set> ---> - -<!-- This version is a variation on the inter-activity slide that - also scales the wallpaper. --> -<!-- -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@anim/decelerate_interpolator"> - <translate android:fromXDelta="0%" android:toXDelta="33%" - android:duration="@android:integer/config_mediumAnimTime"/> -</set> ---> + android:interpolator="@anim/decelerate_cubic_interpolator" + android:duration="160"/> +</set> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ac15be6..4f077b6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -66,6 +66,10 @@ <!-- The duration (in milliseconds) of a long animation. --> <integer name="config_longAnimTime">500</integer> + <!-- The duration (in milliseconds) of the activity open/close and fragment open/close animations. --> + <integer name="config_activityShortDur">150</integer> + <integer name="config_activityDefaultDur">220</integer> + <!-- The duration (in milliseconds) that the radio will scan for a signal when there's no network connection. If the scan doesn't timeout, use zero --> <integer name="config_radioScanningTimeout">0</integer> |