diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-08-02 17:31:44 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2011-08-02 22:53:31 -0700 |
commit | 59aed3885e7bf34b4d7c021db4243484fa267526 (patch) | |
tree | 5227c1bf8900765d1aa23b28fe0c2d264c4091ef /core | |
parent | f4461fc5a62658f5d150ca0ef2c135aef1236554 (diff) | |
download | frameworks_base-59aed3885e7bf34b4d7c021db4243484fa267526.zip frameworks_base-59aed3885e7bf34b4d7c021db4243484fa267526.tar.gz frameworks_base-59aed3885e7bf34b4d7c021db4243484fa267526.tar.bz2 |
Put back the status bar animations.
Change-Id: I9b326e8da9fa17878dde8a83c6551e9eb600bb7e
Diffstat (limited to 'core')
-rw-r--r-- | core/res/res/anim/priority_alert_enter.xml | 14 | ||||
-rw-r--r-- | core/res/res/anim/priority_alert_exit.xml | 14 | ||||
-rw-r--r-- | core/res/res/anim/status_bar_enter.xml | 26 | ||||
-rw-r--r-- | core/res/res/anim/status_bar_exit.xml | 26 | ||||
-rw-r--r-- | core/res/res/values/styles.xml | 13 |
5 files changed, 0 insertions, 93 deletions
diff --git a/core/res/res/anim/priority_alert_enter.xml b/core/res/res/anim/priority_alert_enter.xml deleted file mode 100644 index 4fd6a7c..0000000 --- a/core/res/res/anim/priority_alert_enter.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" - > - <scale - android:interpolator="@android:interpolator/overshoot" - android:fromXScale="0.7" android:toXScale="1.0" - android:fromYScale="0.7" android:toYScale="1.0" - android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha - android:interpolator="@android:interpolator/decelerate_quad" - android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_shortAnimTime" /> -</set> diff --git a/core/res/res/anim/priority_alert_exit.xml b/core/res/res/anim/priority_alert_exit.xml deleted file mode 100644 index 05c144a..0000000 --- a/core/res/res/anim/priority_alert_exit.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" - > - <scale - android:interpolator="@android:interpolator/accelerate_quad" - android:fromXScale="1.0" android:toXScale="0.7" - android:fromYScale="1.0" android:toYScale="0.7" - android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha - android:interpolator="@android:interpolator/accelerate_quad" - android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="@android:integer/config_shortAnimTime" /> -</set> diff --git a/core/res/res/anim/status_bar_enter.xml b/core/res/res/anim/status_bar_enter.xml deleted file mode 100644 index 1a1dc9b..0000000 --- a/core/res/res/anim/status_bar_enter.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/anim/options_panel_enter.xml -** -** Copyright 2007, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/decelerate_quad"> - <translate android:fromYDelta="-75%" 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/status_bar_exit.xml b/core/res/res/anim/status_bar_exit.xml deleted file mode 100644 index 1f71090..0000000 --- a/core/res/res/anim/status_bar_exit.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/anim/options_panel_exit.xml -** -** Copyright 2007, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/accelerate_quad"> - <translate android:fromYDelta="0" android:toYDelta="-75%" - 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/values/styles.xml b/core/res/res/values/styles.xml index 5aa47b7..ed2d3b0 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -95,19 +95,6 @@ <item name="windowExitAnimation">@anim/dialog_exit</item> </style> - <!-- Standard animations for hiding and showing the status bar. --> - <style name="Animation.StatusBar"> - <item name="windowEnterAnimation">@anim/status_bar_enter</item> - <item name="windowExitAnimation">@anim/status_bar_exit</item> - </style> - - <!-- {@hide} --> - <style name="Animation.StatusBar.IntruderAlert" - parent="@android:style/Animation.StatusBar"> - <item name="android:windowEnterAnimation">@anim/priority_alert_enter</item> - <item name="android:windowExitAnimation">@anim/priority_alert_exit</item> - </style> - <!-- Standard animations for a translucent window or activity. This style is <em>not<em> used by default for the translucent theme (since translucent activities are a special case that have no |