Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2694862b authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix disable flag in QSBH" into sc-v2-dev am: c09887ba am: 33b835cb 

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

Change-Id: I4a7df566ca3412f10539da0547fe18cfd1e04c3c
parents 85e9404d 33b835cb

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+3 −4
Original line number Diff line number Diff line
@@ -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);