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

Merge "Fix QS header settings + user visibilities" into nyc-dev

Browse Source 
am: 3f50a94e6c

* commit '3f50a94e6c5afff6814b88f59b59475616836e6c':
  Fix QS header settings + user visibilities

Change-Id: I4644fecc16ee4f83c796fc6d30b0ad9646959560
This commit is contained in:
Jason Monk
2016-05-05 15:45:43 +00:00
committed by android-build-merger
parent 5f236d9a4a 3f50a94e6c
commit 27461881b8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -287,10 +287,11 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
updateAlarmVisibilities();
mEmergencyOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly
? View.VISIBLE : View.INVISIBLE);
mSettingsContainer.setVisibility(mExpanded ? View.VISIBLE : View.INVISIBLE);
mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(
TunerService.isTunerEnabled(mContext) ? View.VISIBLE : View.INVISIBLE);
mMultiUserSwitch.setVisibility(mMultiUserSwitch.hasMultipleUsers() ? View.VISIBLE
: View.GONE);
mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers()
? View.VISIBLE : View.INVISIBLE);
}
private void updateListeners() {