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

Commit 27a810ed authored by Bruno Martins's avatar Bruno Martins
Browse files

LineageParts: Move RTL mode checks to a helper method 

Change-Id: Iaedbc991efb2c9c43a50fbbaddd1447f914d2779
parent f5b8e9d4

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

+3 −2
Original line number Diff line number Diff line
@@ -5,9 +5,10 @@ 


package org.lineageos.lineageparts.statusbar;



import static org.lineageos.lineageparts.utils.ResourceUtils.isRtlMode;



import android.content.ContentResolver;

import android.os.Bundle;

import android.view.View;



import androidx.preference.ListPreference;

import androidx.preference.Preference;
@@ -67,7 +68,7 @@ public class NetworkTrafficSettings extends SettingsPreferenceFragment 
        mNetTrafficPosition.setOnPreferenceChangeListener(this);



        // Adjust network traffic preferences for RTL

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

        if (isRtlMode(getResources())) {

            if (disallowCenteredTraffic) {

                mNetTrafficPosition.setEntries(R.array.network_traffic_position_entries_notch_rtl);

                mNetTrafficPosition.setEntryValues(R.array.network_traffic_position_values_notch);

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

+4 −5
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ 
 */

package org.lineageos.lineageparts.statusbar;



import static org.lineageos.lineageparts.utils.ResourceUtils.isRtlMode;



import android.content.Intent;

import android.os.BatteryManager;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.format.DateFormat;

import android.view.View;



import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;
@@ -115,7 +116,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
                    || getNetworkTrafficStatus() != 0;



        // Adjust status bar preferences for RTL

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

        if (isRtlMode(getResources())) {

            if (disallowCenteredClock) {

                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch_rtl);

                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch);
@@ -170,9 +171,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
                summary = getResources().getString(

                    R.string.status_bar_quick_qs_pulldown_summary,

                    getResources().getString(

                        (value == PULLDOWN_DIR_LEFT) ^

                        (getResources().getConfiguration().getLayoutDirection()

                            == View.LAYOUT_DIRECTION_RTL)

                        (value == PULLDOWN_DIR_LEFT) ^ isRtlMode(getResources())

                        ? R.string.status_bar_quick_qs_pulldown_summary_left

                        : R.string.status_bar_quick_qs_pulldown_summary_right));

                break;

src/org/lineageos/lineageparts/utils/ResourceUtils.java

+6 −0
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2016 The CyanogenMod project

 * SPDX-FileCopyrightText: 2026 The LineageOS project

 * SPDX-License-Identifier: Apache-2.0

 */

package org.lineageos.lineageparts.utils;



import android.content.res.Resources;

import android.util.Log;

import android.view.View;



public class ResourceUtils {
@@ -30,4 +32,8 @@ public class ResourceUtils { 
            return res.getString(resId);

        }

    }



    public static boolean isRtlMode(final Resources res) {

        return res.getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;

    }

}