summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-09-19 12:23:35 -0400
committerJohn Spurlock <jspurlock@google.com>2013-09-19 12:23:35 -0400
commit8c52042264b638f788a8a0c665599b9cdccb7d14 (patch)
tree414ff4dc14400dbf428acfa5f67ec8379f7de3cb /packages
parent219d0f32ddd1ae82588f8b5eaa46f319c83b5fe3 (diff)
downloadframeworks_base-8c52042264b638f788a8a0c665599b9cdccb7d14.zip
frameworks_base-8c52042264b638f788a8a0c665599b9cdccb7d14.tar.gz
frameworks_base-8c52042264b638f788a8a0c665599b9cdccb7d14.tar.bz2
Don't disable animations until screen state is known.
Bug:10602521 Change-Id: I54a0c7a9dfd7d9c248854738414613d32d85476a
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 8cc538f..86299b8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -308,7 +308,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
private boolean mAutohideSuspended;
private int mStatusBarMode;
private int mNavigationBarMode;
- private boolean mScreenOn;
+ private Boolean mScreenOn;
private final Runnable mAutohide = new Runnable() {
@Override
@@ -1895,8 +1895,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
private void checkBarMode(int mode, int windowState, BarTransitions transitions) {
final boolean imeVisible = (mNavigationIconHints & NAVIGATION_HINT_BACK_ALT) != 0;
final int finalMode = imeVisible ? MODE_OPAQUE : mode;
- final boolean animate = mScreenOn && windowState != WINDOW_STATE_HIDDEN;
- transitions.transitionTo(finalMode, animate);
+ final boolean anim = (mScreenOn == null || mScreenOn) && windowState != WINDOW_STATE_HIDDEN;
+ transitions.transitionTo(finalMode, anim);
}
private final Runnable mCheckBarModes = new Runnable() {