drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f732e37c: Merge "If the panels are disabled, don\'t go opaque on interaction." into klp-dev

Browse Source 
* commit 'f732e37c1911831a8d26fd228a00063b9b489a42':
  If the panels are disabled, don't go opaque on interaction.
This commit is contained in:
John Spurlock
2013-10-13 15:13:11 -07:00
committed by Android Git Automerger
parent 7d3fb2d6c5 f732e37c19
commit 45d41eba7a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1928,8 +1928,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
private void checkBarModes() { private void checkBarModes() {
if (mDemoMode) return; if (mDemoMode) return;
checkBarMode((mInteractingWindows & StatusBarManager.WINDOW_STATUS_BAR) != 0 ? MODE_OPAQUE int sbMode = mStatusBarMode;
: mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions()); if (panelsEnabled() && (mInteractingWindows & StatusBarManager.WINDOW_STATUS_BAR) != 0) {
// if panels are expandable, force the status bar opaque on any interaction
sbMode = MODE_OPAQUE;
}
checkBarMode(sbMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());
if (mNavigationBarView != null) { if (mNavigationBarView != null) {
checkBarMode(mNavigationBarMode, checkBarMode(mNavigationBarMode,
mNavigationBarWindowState, mNavigationBarView.getBarTransitions()); mNavigationBarWindowState, mNavigationBarView.getBarTransitions());