diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-04-16 19:31:58 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2012-04-16 19:31:58 -0700 |
commit | 8eedb8bf603ed313e3c3b39292dfae908ff60af5 (patch) | |
tree | 2435cb6681e07e18e5410f107f8718f5155479d2 /core/res | |
parent | ac4243f177efb66f15df2f818418eac2b7abcec7 (diff) | |
download | frameworks_base-8eedb8bf603ed313e3c3b39292dfae908ff60af5.zip frameworks_base-8eedb8bf603ed313e3c3b39292dfae908ff60af5.tar.gz frameworks_base-8eedb8bf603ed313e3c3b39292dfae908ff60af5.tar.bz2 |
Change dock animations to not use alpha, to make Mathias happy.
Also tweak the action bar animations to slide up/down like the
dock animations.
Change-Id: Id3c85ba76100639a6f6c77b7fd2a060c9d26f38c
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/anim/dock_bottom_enter.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_bottom_exit.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_left_enter.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_left_exit.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_right_enter.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_right_exit.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_top_enter.xml | 4 | ||||
-rw-r--r-- | core/res/res/anim/dock_top_exit.xml | 4 |
8 files changed, 8 insertions, 24 deletions
diff --git a/core/res/res/anim/dock_bottom_enter.xml b/core/res/res/anim/dock_bottom_enter.xml index 7a2e94b..74a021b 100644 --- a/core/res/res/anim/dock_bottom_enter.xml +++ b/core/res/res/anim/dock_bottom_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the bottom of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromYDelta="75%" android:toYDelta="0" + <translate android:fromYDelta="100%" android:toYDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_bottom_exit.xml b/core/res/res/anim/dock_bottom_exit.xml index c2fd15c..213b3d9 100644 --- a/core/res/res/anim/dock_bottom_exit.xml +++ b/core/res/res/anim/dock_bottom_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the bottom of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromYDelta="0" android:toYDelta="75%" + <translate android:fromYDelta="0" android:toYDelta="100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_left_enter.xml b/core/res/res/anim/dock_left_enter.xml index b057f67..4fce35a 100644 --- a/core/res/res/anim/dock_left_enter.xml +++ b/core/res/res/anim/dock_left_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the left of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromXDelta="-75%" android:toXDelta="0" + <translate android:fromXDelta="-100%" android:toXDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_left_exit.xml b/core/res/res/anim/dock_left_exit.xml index 576b1aa..bce203d 100644 --- a/core/res/res/anim/dock_left_exit.xml +++ b/core/res/res/anim/dock_left_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the right of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromXDelta="0" android:toXDelta="-75%" + <translate android:fromXDelta="0" android:toXDelta="-100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_right_enter.xml b/core/res/res/anim/dock_right_enter.xml index e1bd190..26b8ad6 100644 --- a/core/res/res/anim/dock_right_enter.xml +++ b/core/res/res/anim/dock_right_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the right of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromXDelta="75%" android:toXDelta="0" + <translate android:fromXDelta="100%" android:toXDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_right_exit.xml b/core/res/res/anim/dock_right_exit.xml index 6d778fa..6beda59 100644 --- a/core/res/res/anim/dock_right_exit.xml +++ b/core/res/res/anim/dock_right_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the right of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromXDelta="0" android:toXDelta="75%" + <translate android:fromXDelta="0" android:toXDelta="100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_top_enter.xml b/core/res/res/anim/dock_top_enter.xml index f2e4cae..594b479 100644 --- a/core/res/res/anim/dock_top_enter.xml +++ b/core/res/res/anim/dock_top_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the top of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromYDelta="-75%" android:toYDelta="0" + <translate android:fromYDelta="-100%" android:toYDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_top_exit.xml b/core/res/res/anim/dock_top_exit.xml index 7373695..b9691f6 100644 --- a/core/res/res/anim/dock_top_exit.xml +++ b/core/res/res/anim/dock_top_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the top of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromYDelta="0" android:toYDelta="-75%" + <translate android:fromYDelta="0" android:toYDelta="-100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> |