diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-11 13:40:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-11 13:40:43 +0000 |
| commit | 7b51185362df5bf1c4844c171350197a2fd2a4c1 (patch) | |
| tree | 903ae6d94dd445ca4632e6fd7b799f9713433bc8 | |
| parent | fe051aa36b2b706b20afa90c5c3cbbead2bb05fe (diff) | |
| parent | 28d22d0aef38b97550d098c006e3f9d7fc4e3de2 (diff) | |
| download | frameworks_base-7b51185362df5bf1c4844c171350197a2fd2a4c1.zip frameworks_base-7b51185362df5bf1c4844c171350197a2fd2a4c1.tar.gz frameworks_base-7b51185362df5bf1c4844c171350197a2fd2a4c1.tar.bz2 | |
Merge "Don't force black status bar when expanded."
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 8 |
1 files changed, 1 insertions, 7 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 587e1c0..62390ab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1869,13 +1869,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 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()); |