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

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

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

parents 1a5e361d 3e43b47f

res/xml/network_traffic_settings.xml

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



    <DropDownPreference

    <ListPreference

        android:entries="@array/network_traffic_mode_entries"

        android:entryValues="@array/network_traffic_mode_values"

        android:key="network_traffic_mode"
@@ -13,7 +13,7 @@ 
        android:summary="%s"

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



    <DropDownPreference

    <ListPreference

        android:entries="@array/network_traffic_position_entries"

        android:entryValues="@array/network_traffic_position_values"

        android:key="network_traffic_position"
@@ -27,7 +27,7 @@ 
        android:summary="@string/network_traffic_autohide_summary"

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



    <DropDownPreference

    <ListPreference

        android:entries="@array/network_traffic_units_entries"

        android:entryValues="@array/network_traffic_units_values"

        android:key="network_traffic_units"
@@ -35,7 +35,7 @@ 
        android:summary="%s"

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



    <DropDownPreference

    <ListPreference

        android:entries="@array/network_traffic_show_units_entries"

        android:entryValues="@array/network_traffic_show_units_values"

        android:key="network_traffic_show_units"

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

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import android.content.ContentResolver; 
import android.os.Bundle;

import android.view.View;



import androidx.preference.DropDownPreference;

import androidx.preference.ListPreference;

import androidx.preference.Preference;



import lineageos.preference.LineageSecureSettingSwitchPreference;
@@ -39,11 +39,11 @@ public class NetworkTrafficSettings extends SettingsPreferenceFragment 
    private static final int SHOW_UNITS_ON = 1;

    private static final int SHOW_UNITS_COMPACT = 2;



    private DropDownPreference mNetTrafficMode;

    private DropDownPreference mNetTrafficPosition;

    private ListPreference mNetTrafficMode;

    private ListPreference mNetTrafficPosition;

    private LineageSecureSettingSwitchPreference mNetTrafficAutohide;

    private DropDownPreference mNetTrafficUnits;

    private DropDownPreference mNetTrafficShowUnits;

    private ListPreference mNetTrafficUnits;

    private ListPreference mNetTrafficShowUnits;



    @Override

    public void onCreate(Bundle savedInstanceState) {