From 686820a402497611f9392488786df0d17d70238a Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Tue, 3 Sep 2013 14:44:16 -0400 Subject: [PATCH] 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 --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 6 +++--- 1 file 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 870202aa20616..ddd7c8b68cff3 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); } }