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

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

Change-Id: I4a7df566ca3412f10539da0547fe18cfd1e04c3c
This commit is contained in:
Fabian Kozynski
2022-01-14 15:46:55 +00:00
committed by Automerger Merge Worker

View File

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