Skip to content

Commit

Permalink
am 41ecb84d: Merge "Don\'t force black status bar when expanded."
Browse files Browse the repository at this point in the history
* commit '41ecb84d7ca1995fe020e8c2d3e6bb98edde37b6':
  Don't force black status bar when expanded.
  • Loading branch information
XSJoJo authored and Android Git Automerger committed May 11, 2014
2 parents a62a54f + 7b51185 commit fd53782
Showing 1 changed file with 1 addition and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1869,13 +1869,7 @@ private int barMode(int vis, int transientFlag, int translucentFlag) {

private void checkBarModes() {
if (mDemoMode) return;
int sbMode = mStatusBarMode;
if (panelsEnabled() && (mInteractingWindows & StatusBarManager.WINDOW_STATUS_BAR) != 0
&& mState != StatusBarState.KEYGUARD) {
// if panels are expandable, force the status bar opaque on any interaction
sbMode = MODE_OPAQUE;
}
checkBarMode(sbMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());
checkBarMode(mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());
if (mNavigationBarView != null) {
checkBarMode(mNavigationBarMode,
mNavigationBarWindowState, mNavigationBarView.getBarTransitions());
Expand Down

0 comments on commit fd53782

Please sign in to comment.