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

Commit 897fba58 authored by Luca Stefani's avatar Luca Stefani
Browse files

LineageParts: Remove center clock position for devices with notch 

* Also fix quick pulldown entries when in RTL

Change-Id: I2861a478d11b9671e1a98cb8e5c223481e728a83
parent 95674bc5

res/values/arrays.xml

+32 −0
Original line number Diff line number Diff line
@@ -228,6 +228,32 @@ 
        <item>2</item>

    </string-array>



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

        <item>2</item>

        <item>1</item>

        <item>0</item>

    </string-array>



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

        <item>@string/status_bar_clock_position_right</item>

        <item>@string/status_bar_clock_position_left</item>

    </string-array>



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

        <item>@string/status_bar_clock_position_left</item>

        <item>@string/status_bar_clock_position_right</item>

    </string-array>



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

        <item>0</item>

        <item>2</item>

    </string-array>



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

        <item>2</item>

        <item>0</item>

    </string-array>



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

        <item>@string/status_bar_am_pm_normal</item>

        <item>@string/status_bar_am_pm_small</item>
@@ -287,6 +313,12 @@ 
        <item>2</item>

    </string-array>



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

        <item>2</item>

        <item>1</item>

        <item>0</item>

    </string-array>



    <!-- Weather temperature -->

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

        <item>@string/weather_settings_temp_celsius</item>

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

+14 −1
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    public void onResume() {

        super.onResume();



        final boolean hasNotch = getResources().getBoolean(

                org.lineageos.platform.internal.R.bool.config_haveNotch);



        final String curIconBlacklist = Settings.Secure.getString(getContext().getContentResolver(),

                ICON_BLACKLIST);
@@ -105,8 +108,18 @@ public class StatusBarSettings extends SettingsPreferenceFragment 


        // Adjust status bar preferences for RTL

        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {

            if (hasNotch) {

                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch_rtl);

                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch_rtl);

            } else {

                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_rtl);

                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_rtl);

            }

            mQuickPulldown.setEntries(R.array.status_bar_quick_qs_pulldown_entries_rtl);

            mQuickPulldown.setEntryValues(R.array.status_bar_quick_qs_pulldown_values_rtl);

        } else if (hasNotch) {

            mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch);

            mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch);

        }

    }