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

Commit 0cb7f5b8 authored by LuK1337's avatar LuK1337
Browse files

SystemUI: Preserve battery icon blacklist state when setting icon style 

* Fixes : https://gitlab.com/LineageOS/issues/android/issues/783

Change-Id: Ibd1ae4bfbca4bd3b2cbc7ed6a9195a3c4da591b7
parent 32816a68

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+5 −4
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public class BatteryMeterView extends LinearLayout implements 
    private TextView mBatteryPercentView;



    private boolean mCharging;

    private boolean mBatteryHidden;

    private int mBatteryStyle = BATTERY_STYLE_PORTRAIT;



    private BatteryController mBatteryController;
@@ -211,9 +212,9 @@ public class BatteryMeterView extends LinearLayout implements 
    public void onTuningChanged(String key, String newValue) {

        if (StatusBarIconController.ICON_BLACKLIST.equals(key)) {

            ArraySet<String> icons = StatusBarIconController.getIconBlacklist(newValue);

            boolean hidden = icons.contains(mSlotBattery);

            Dependency.get(IconLogger.class).onIconVisibility(mSlotBattery, !hidden);

            setVisibility(hidden ? View.GONE : View.VISIBLE);

            mBatteryHidden = icons.contains(mSlotBattery);

            Dependency.get(IconLogger.class).onIconVisibility(mSlotBattery, !mBatteryHidden);

            setVisibility(mBatteryHidden ? View.GONE : View.VISIBLE);

        } else if (STATUS_BAR_BATTERY_STYLE.equals(key) && newValue != null) {

            mBatteryStyle = Integer.parseInt(newValue);

            updateBatteryStyle();
@@ -347,7 +348,7 @@ public class BatteryMeterView extends LinearLayout implements 
            mBatteryIconView.setImageDrawable(mDrawable);

            scaleBatteryMeterViews();

        }

        setVisibility(View.VISIBLE);

        setVisibility(mBatteryHidden ? View.GONE : View.VISIBLE);

    }



    @Override