summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-10-10 20:31:00 -0700
committerCraig Mautner <cmautner@google.com>2013-10-10 20:31:00 -0700
commit2881630af92aa089e8d4c68527198379a3895dee (patch)
tree9ec5ddbc206f2c5b30ece974e25e66147752e5e0 /policy/src
parent619fc89aa176a4fa2895933d536987bb278acfb5 (diff)
downloadframeworks_base-2881630af92aa089e8d4c68527198379a3895dee.zip
frameworks_base-2881630af92aa089e8d4c68527198379a3895dee.tar.gz
frameworks_base-2881630af92aa089e8d4c68527198379a3895dee.tar.bz2
Reduce jank on incoming phone call during dream.
- Include dreams in the conditions that disable transition animations. This way there is no visibility of activities that are closing behind the keyguard when an activity that dismisses the keyguard starts up. - Do not notify the keyguard mediator when the keyguard is dismissed because a dream is starting up. This keeps activities from resuming just because the keyguard is being dismissed. Fixes bug 11064847. Change-Id: I9d32fc96d518b1cdab511e187226a3cb889cf6d4
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index dd4f3d1..1869e3f 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3509,7 +3509,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
| FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER;
}
- mKeyguardDelegate.setHidden(true);
+ if (!mShowingDream) {
+ mKeyguardDelegate.setHidden(true);
+ }
} else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) {
// This is the case of keyguard isSecure() and not mHideLockScreen.
if (mDismissKeyguard == DISMISS_KEYGUARD_START) {
@@ -3550,9 +3552,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
public boolean allowAppAnimationsLw() {
- if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) {
- // If keyguard is currently visible, no reason to animate
- // behind it.
+ if (mKeyguard != null && mKeyguard.isVisibleLw() || mShowingDream) {
+ // If keyguard or dreams is currently visible, no reason to animate behind it.
return false;
}
return true;