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

Commit bda76927 authored by Hendrik Hagendorn's avatar Hendrik Hagendorn Committed by Bruno Martins
Browse files

LineageParts: Bring back and refactor battery icon options 

* Use the icon blacklist for hiding
* Combine options for hiding status bar icons in system tuner settings

Change-Id: Id8c6df982192cfb54350c9cfe8d8ca4983dd7972
parent 737407a5

res/values/arrays.xml

+1 −5
Original line number Diff line number Diff line
@@ -268,18 +268,14 @@ 


    <string-array name="status_bar_battery_style_entries" translatable="false">

        <item>@string/status_bar_battery_style_icon_portrait</item>

        <item>@string/status_bar_battery_style_icon_landscape</item>

        <item>@string/status_bar_battery_style_circle</item>

        <item>@string/status_bar_battery_style_text</item>

        <item>@string/status_bar_battery_style_hidden</item>

    </string-array>



    <string-array name="status_bar_battery_style_values" translatable="false">

        <item>0</item>

        <item>5</item>

        <item>1</item>

        <item>2</item>

        <item>6</item>

        <item>4</item>

    </string-array>



    <string-array name="status_bar_battery_percentage_entries" translatable="false">

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -482,10 +482,8 @@ 
    <string name="status_bar_battery_title">Battery indicator</string>

    <string name="status_bar_battery_style_title">Battery status style</string>

    <string name="status_bar_battery_style_icon_portrait">Icon portrait</string>

    <string name="status_bar_battery_style_icon_landscape">Icon landscape</string>

    <string name="status_bar_battery_style_circle">Circle</string>

    <string name="status_bar_battery_style_text">Text</string>

    <string name="status_bar_battery_style_hidden">Hidden</string>



    <!-- Status bar - Battery percentage -->

    <string name="status_bar_battery_percentage_title">Battery percentage</string>

res/xml/status_bar_settings.xml

+1 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
            android:defaultValue="2" />

    </PreferenceCategory>



<!--

    <PreferenceCategory

        android:title="@string/status_bar_battery_title">
@@ -94,7 +93,7 @@ 
            android:dialogTitle="@string/status_bar_battery_style_title"

            android:entries="@array/status_bar_battery_style_entries"

            android:entryValues="@array/status_bar_battery_style_values"

            android:defaultValue="2" />

            android:defaultValue="0" />



        <lineageos.preference.LineageSystemSettingListPreference

            android:key="status_bar_show_battery_percent"
@@ -106,7 +105,6 @@ 
            android:defaultValue="0" />



    </PreferenceCategory>

-->



    <PreferenceCategory

        android:title="@string/status_bar_brightness_category">

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

+3 −9
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";

    private static final String STATUS_BAR_QUICK_QS_PULLDOWN = "qs_quick_pulldown";



    private static final int STATUS_BAR_BATTERY_STYLE_HIDDEN = 4;

    private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 6;

    private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 2;



    private static final int PULLDOWN_DIR_NONE = 0;

    private static final int PULLDOWN_DIR_RIGHT = 1;

    private static final int PULLDOWN_DIR_LEFT = 2;
@@ -93,14 +93,12 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
        mStatusBarClockCategory =

                (PreferenceCategory) getPreferenceScreen().findPreference(CATEGORY_CLOCK);



/*

        mStatusBarBatteryShowPercent =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);

        mStatusBarBattery =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);

        mStatusBarBattery.setOnPreferenceChangeListener(this);

        enableStatusBarBatteryDependents(mStatusBarBattery.getIntValue(2));

*/



        mQuickPulldown =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_QUICK_QS_PULLDOWN);
@@ -162,19 +160,15 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
            case STATUS_BAR_CLOCK_STYLE:

                updateNetworkTrafficStatus(value);

                break;

/*

            case STATUS_BAR_BATTERY_STYLE:

                enableStatusBarBatteryDependents(value);

                break;

*/

        }

        return true;

    }



    private void enableStatusBarBatteryDependents(int batteryIconStyle) {

        mStatusBarBatteryShowPercent.setEnabled(

                batteryIconStyle != STATUS_BAR_BATTERY_STYLE_HIDDEN

                && batteryIconStyle != STATUS_BAR_BATTERY_STYLE_TEXT);

        mStatusBarBatteryShowPercent.setEnabled(batteryIconStyle != STATUS_BAR_BATTERY_STYLE_TEXT);

    }



    private void updateQuickPulldownSummary(int value) {