Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't ever disable the status/nav bar." into klp-dev

Browse Source
This commit is contained in:
John Spurlock
2013-09-03 19:12:54 +00:00
committed by Android (Google) Code Review
parent 7f15b03d16 686820a402
commit bfa29c7181
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -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);
}
}