Merge "Fix disable flag in QSBH" into sc-v2-dev am: c09887ba23

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16615507

Change-Id: Ic11e6ade65421ce9db1f4876a9c1811789481ca2
This commit is contained in:
Fabian Kozynski
2022-01-14 15:34:11 +00:00
committed by Automerger Merge Worker

View File

@@ -241,10 +241,9 @@ public class QuickStatusBarHeader extends FrameLayout {
boolean shouldUseSplitShade = boolean shouldUseSplitShade =
resources.getBoolean(R.bool.config_use_split_notification_shade); resources.getBoolean(R.bool.config_use_split_notification_shade);
mStatusIconsView.setVisibility( boolean gone = shouldUseSplitShade || mUseCombinedQSHeader || mQsDisabled;
shouldUseSplitShade || mUseCombinedQSHeader ? View.GONE : View.VISIBLE); mStatusIconsView.setVisibility(gone ? View.GONE : View.VISIBLE);
mDatePrivacyView.setVisibility( mDatePrivacyView.setVisibility(gone ? View.GONE : View.VISIBLE);
shouldUseSplitShade || mUseCombinedQSHeader ? View.GONE : View.VISIBLE);
mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH); mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);