summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-12-18 16:53:55 -0800
committerDianne Hackborn <hackbod@google.com>2009-12-21 15:26:51 -0800
commitde2606dcd36e9dfa49c42dbc68c539505d5ff8d4 (patch)
tree0e1bd13b9b4b68c98701d2a46796694e355cb669 /core/res
parent126b02faee5753740cbdaedc35dc9eb279215360 (diff)
downloadframeworks_base-de2606dcd36e9dfa49c42dbc68c539505d5ff8d4.zip
frameworks_base-de2606dcd36e9dfa49c42dbc68c539505d5ff8d4.tar.gz
frameworks_base-de2606dcd36e9dfa49c42dbc68c539505d5ff8d4.tar.bz2
Don't perform app transition of the app is not currently visible.
Yet more special casing for the window manager... try really hard, if we are performing an activity transition that is behind an opaque window (like say the lock screen or status bar) to just not do it. And, just as important, do a reasonable transition away from whatever is on top. Examples: - If the lock screen is up, and you get a call or press the emergency dialer button, we fade from the lock screen to the new UI, instead of fading to the animation going on between the old and new. - If you are in something hiding the lock screen, like the in-call screen, and that is hidden, then fade back to the lock screen. - If you select an item from the status bar, then have the new item displayed behind it as the status bar rolls up rather than seeing a second animation. (In fact this can't always be done because we may not start the transition to the new thing until the status bar is already going away. But for most cases we can do this with just one anim.)
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/anim/lock_screen_enter.xml24
-rw-r--r--core/res/res/anim/lock_screen_exit.xml3
-rw-r--r--core/res/res/values/styles.xml1
3 files changed, 27 insertions, 1 deletions
diff --git a/core/res/res/anim/lock_screen_enter.xml b/core/res/res/anim/lock_screen_enter.xml
new file mode 100644
index 0000000..dd47ff8
--- /dev/null
+++ b/core/res/res/anim/lock_screen_enter.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** 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="@anim/decelerate_interpolator">
+ <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_mediumAnimTime" />
+</set>
diff --git a/core/res/res/anim/lock_screen_exit.xml b/core/res/res/anim/lock_screen_exit.xml
index 58bc6db..077fc6b 100644
--- a/core/res/res/anim/lock_screen_exit.xml
+++ b/core/res/res/anim/lock_screen_exit.xml
@@ -17,7 +17,8 @@
*/
-->
-<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_interpolator">
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_longAnimTime" />
</set>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index b155769..f2b52d9 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -101,6 +101,7 @@
<!-- Standard animations for a non-full-screen window or activity. -->
<style name="Animation.LockScreen">
+ <item name="windowEnterAnimation">@anim/lock_screen_enter</item>
<item name="windowExitAnimation">@anim/lock_screen_exit</item>
</style>