summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2013-09-03 14:44:16 -0400
committer John Spurlock <jspurlock@google.com> 2013-09-03 14:44:16 -0400
commit686820a402497611f9392488786df0d17d70238a (patch)
treefcb86787ff434309243e0580a3708d1646218c2f
parent96661c42d0643c129fed60678aa0b8f99d32b456 (diff)
Don't ever disable the status/nav bar.
Revert part of the fix for b/8682123 until we figure out why the window state does not flip to SHOWING in BarController. Bug:10488453 Change-Id: Ic5d60a6d945b470fd519dc01de30690e61c62e01
-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 870202aa2061..ddd7c8b68cff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1741,7 +1741,9 @@ public class PhoneStatusBar extends BaseStatusBar {
mGestureRec.add(event);
}
- setInteracting(true);
+ if (mStatusBarWindowState == WINDOW_STATE_SHOWING) {
+ setInteracting(true);
+ }
return false;
}
@@ -1769,7 +1771,6 @@ public class PhoneStatusBar extends BaseStatusBar {
&& mStatusBarWindowState != state) {
mStatusBarWindowState = state;
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));
- mStatusBarWindow.setEnabled(showing);
if (!showing) {
mStatusBarView.collapseAllPanels(false);
}
@@ -1779,7 +1780,6 @@ public class PhoneStatusBar extends BaseStatusBar {
&& mNavigationBarWindowState != state) {
mNavigationBarWindowState = state;
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));
- mNavigationBarView.setEnabled(showing);
}
}