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

Commit afd71e41 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 4e0eebf4 92b85fbf

res/values/bools.xml

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2015 The CyanogenMod Project

     SPDX-FileCopyrightText: 2021 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->

<resources>



    <!-- Default value for battery_light_enabled preference -->

    <bool name="def_battery_light_enabled">true</bool>

    <!-- Default value for battery light pulse -->

    <bool name="def_battery_light_pulse">true</bool>

    <!-- Default value for battery light disabled when fully charged preference -->

    <bool name="def_battery_light_full_charge_disabled">false</bool>



</resources>

res/xml/battery_light_settings.xml

+1 −4
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ 


    <lineageos.preference.LineageSystemSettingMainSwitchPreference

        android:key="battery_light_enabled"

        android:title="@string/battery_light_enable_title"

        android:defaultValue="@bool/def_battery_light_enabled" />

        android:title="@string/battery_light_enable_title" />



    <PreferenceCategory

        android:key="general_section"
@@ -21,13 +20,11 @@ 
        <lineageos.preference.LineageSystemSettingSwitchPreference

            android:key="battery_light_pulse"

            android:title="@string/battery_low_pulse_title"

            android:defaultValue="@bool/def_battery_light_pulse"

            android:dependency="battery_light_enabled" />



        <lineageos.preference.LineageSystemSettingSwitchPreference

            android:key="battery_light_full_charge_disabled"

            android:title="@string/battery_light_full_charge_disabled_title"

            android:defaultValue="@bool/def_battery_light_full_charge_disabled"

            android:dependency="battery_light_enabled" />



    </PreferenceCategory>

src/org/lineageos/lineageparts/notificationlight/BatteryLightSettings.java

+12 −8
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 
    private static final String BRIGHTNESS_PREFERENCE = "battery_light_brightness_level";

    private static final String BRIGHTNESS_ZEN_PREFERENCE = "battery_light_brightness_level_zen";



    private static final boolean DEFAULT_LIGHT_ENABLED_PREF = true;

    private static final boolean DEFAULT_LIGHT_FULL_CHARGE_DISABLED_PREF = true;

    private static final boolean DEFAULT_PULSE_ENABLED_PREF = true;



    private ApplicationLightPreference mLowColorPref;

    private ApplicationLightPreference mMediumColorPref;

    private ApplicationLightPreference mFullColorPref;
@@ -105,12 +109,15 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 


        int batteryBrightness = mBatteryBrightnessPref.getBrightnessSetting();



        mLightEnabledPref.setDefaultValue(DEFAULT_LIGHT_ENABLED_PREF);

        mLightFullChargeDisabledPref.setDefaultValue(DEFAULT_LIGHT_FULL_CHARGE_DISABLED_PREF);

        mPulseEnabledPref.setDefaultValue(DEFAULT_PULSE_ENABLED_PREF);



        if (!blinkingLed || segmentedBatteryLed) {

            generalPrefs.removePreference(mPulseEnabledPref);

        }



        if (mMultiColorLed) {

            generalPrefs.removePreference(mLightFullChargeDisabledPref);

            setHasOptionsMenu(true);



            // Low, Medium and full color preferences
@@ -248,10 +255,9 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 


    protected void resetToDefaults() {

        final Resources res = getResources();

        final boolean batteryLightEnabled = res.getBoolean(R.bool.def_battery_light_enabled);

        final boolean batteryLightFullChargeDisabled =

                res.getBoolean(R.bool.def_battery_light_full_charge_disabled);

        final boolean batteryLightPulseEnabled = res.getBoolean(R.bool.def_battery_light_pulse);

        final boolean batteryLightEnabled = DEFAULT_LIGHT_ENABLED_PREF;

        final boolean batteryLightFullChargeDisabled = DEFAULT_LIGHT_FULL_CHARGE_DISABLED_PREF;

        final boolean batteryLightPulseEnabled = DEFAULT_PULSE_ENABLED_PREF;



        if (mLightEnabledPref != null) mLightEnabledPref.setChecked(batteryLightEnabled);

        if (mLightFullChargeDisabledPref != null) {
@@ -293,10 +299,8 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements 
                result.add(LOW_COLOR_PREF);

                result.add(MEDIUM_COLOR_PREF);

                result.add(FULL_COLOR_PREF);

            } else if (LightsCapabilities.supports(context,

            } else if (!LightsCapabilities.supports(context,

                    LightsCapabilities.LIGHTS_RGB_BATTERY_LED)) {

                result.add(LIGHT_FULL_CHARGE_DISABLED_PREF);

            } else {

                result.add(COLORS_SECTION);

                result.add(LOW_COLOR_PREF);

                result.add(MEDIUM_COLOR_PREF);