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

This commit is contained in:
Jason Monk
2016-05-05 15:40:32 +00:00
committed by Android (Google) Code Review

View File

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