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

Commit ca04439e authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 92aefb61 bdecbb3f

src/org/lineageos/lineageparts/statusbar/StatusBarSettings.java

+13 −2
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2014-2015 The CyanogenMod Project

 * SPDX-FileCopyrightText: 2017-2023 The LineageOS Project

 * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project

 * SPDX-License-Identifier: Apache-2.0

 */

package org.lineageos.lineageparts.statusbar;



import android.content.Intent;

import android.os.BatteryManager;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;
@@ -14,6 +16,8 @@ import android.view.View; 
import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;



import com.android.settingslib.fuelgauge.BatteryUtils;



import org.lineageos.lineageparts.R;

import org.lineageos.lineageparts.SettingsPreferenceFragment;

import org.lineageos.lineageparts.utils.DeviceUtils;
@@ -51,6 +55,8 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    private PreferenceCategory mStatusBarBatteryCategory;

    private PreferenceCategory mStatusBarClockCategory;



    private boolean mBatteryPresent;



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -68,6 +74,10 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
        statusBarBattery.setOnPreferenceChangeListener(this);

        enableStatusBarBatteryDependents(statusBarBattery.getIntValue(2));



        Intent intent = BatteryUtils.getBatteryIntent(getContext());

        if (intent != null) {

            mBatteryPresent = intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);

        }

        mStatusBarBatteryCategory = getPreferenceScreen().findPreference(CATEGORY_BATTERY);



        mQuickPulldown = findPreference(STATUS_BAR_QUICK_QS_PULLDOWN);
@@ -88,7 +98,8 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
            getPreferenceScreen().addPreference(mStatusBarClockCategory);

        }



        if (TextUtils.delimitedStringContains(curIconBlacklist, ',', "battery")) {

        if (!mBatteryPresent ||

                TextUtils.delimitedStringContains(curIconBlacklist, ',', "battery")) {

            getPreferenceScreen().removePreference(mStatusBarBatteryCategory);

        } else {

            getPreferenceScreen().addPreference(mStatusBarBatteryCategory);