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

Commit 4ade760a authored by armdebug's avatar armdebug Committed by Bruno Martins
Browse files

LineageParts: Use SimpleSummaryProvider for ListPreference

Setting the summary with string formatting (%s) is deprecated.

Reference: https://developer.android.com/develop/ui/views/components/settings/customize-your-settings#summaries
Change-Id: I70b186738814bdab486e3f1892f34a9ab3a48e46
parent bdbafc04
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@
     SPDX-License-Identifier: Apache-2.0
-->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:lineage="http://schemas.android.com/apk/res-auto"
    android:key="button_settings"
    android:title="@string/button_pref_title">
@@ -304,9 +306,9 @@
        <lineageos.preference.LineageSecureSettingListPreference
            android:key="volume_panel_on_left"
            android:title="@string/volume_panel_position_title"
            android:summary="%s"
            android:entries="@array/volume_panel_position_entries"
            android:entryValues="@array/volume_panel_position_values" />
            android:entryValues="@array/volume_panel_position_values"
            app:useSimpleSummaryProvider="true" />
    </PreferenceCategory>

    <PreferenceCategory
+11 −9
Original line number Diff line number Diff line
@@ -3,23 +3,25 @@
     SPDX-FileCopyrightText: 2017-2026 The LineageOS Project
     SPDX-License-Identifier: Apache-2.0
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <ListPreference
        android:entries="@array/network_traffic_mode_entries"
        android:entryValues="@array/network_traffic_mode_values"
        android:key="network_traffic_mode"
        android:persistent="false"
        android:summary="%s"
        android:title="@string/network_traffic_mode_title" />
        android:title="@string/network_traffic_mode_title"
        app:useSimpleSummaryProvider="true" />

    <ListPreference
        android:entries="@array/network_traffic_position_entries"
        android:entryValues="@array/network_traffic_position_values"
        android:key="network_traffic_position"
        android:persistent="false"
        android:summary="%s"
        android:title="@string/network_traffic_position_title" />
        android:title="@string/network_traffic_position_title"
        app:useSimpleSummaryProvider="true" />

    <lineageos.preference.LineageSecureSettingSwitchPreference
        android:defaultValue="false"
@@ -38,15 +40,15 @@
        android:entryValues="@array/network_traffic_units_values"
        android:key="network_traffic_units"
        android:persistent="false"
        android:summary="%s"
        android:title="@string/network_traffic_units_title" />
        android:title="@string/network_traffic_units_title"
        app:useSimpleSummaryProvider="true" />

    <ListPreference
        android:entries="@array/network_traffic_show_units_entries"
        android:entryValues="@array/network_traffic_show_units_values"
        android:key="network_traffic_show_units"
        android:persistent="false"
        android:summary="%s"
        android:title="@string/network_traffic_show_units" />
        android:title="@string/network_traffic_show_units"
        app:useSimpleSummaryProvider="true" />

</PreferenceScreen>
+6 −5
Original line number Diff line number Diff line
@@ -6,37 +6,38 @@

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:title="@string/preview_data_title">

    <Preference
        android:key="preview_id"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_id_title"
        android:summary="%s" />
        app:useSimpleSummaryProvider="true" />

    <Preference
        android:key="preview_device"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_device_title"
        android:summary="%s" />
        app:useSimpleSummaryProvider="true" />

    <Preference
        android:key="preview_version"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_version_title"
        android:summary="%s" />
        app:useSimpleSummaryProvider="true" />

    <Preference
        android:key="preview_country"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_country_title"
        android:summary="%s" />
        app:useSimpleSummaryProvider="true" />

    <Preference
        android:key="preview_carrier"
        style="?android:preferenceInformationStyle"
        android:title="@string/preview_carrier_title"
        android:summary="%s" />
        app:useSimpleSummaryProvider="true" />

</PreferenceScreen>
+11 −10
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
-->
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:lineage="http://schemas.android.com/apk/res-auto"
    android:key="status_bar_settings"
    android:title="@string/status_bar_title">
@@ -42,11 +43,11 @@
        <lineageos.preference.LineageSystemSettingListPreference
            android:key="status_bar_clock"
            android:title="@string/status_bar_clock_position_title"
            android:summary="%s"
            android:dialogTitle="@string/status_bar_clock_position_title"
            android:entries="@array/status_bar_clock_position_entries"
            android:entryValues="@array/status_bar_clock_position_values"
            android:defaultValue="0" />
            android:defaultValue="0"
            app:useSimpleSummaryProvider="true" />

        <lineageos.preference.SecureSettingSwitchPreference
            android:key="clock_seconds"
@@ -77,20 +78,20 @@
        <lineageos.preference.LineageSystemSettingListPreference
            android:key="status_bar_battery_style"
            android:title="@string/status_bar_battery_style_title"
            android:summary="%s"
            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="0" />
            android:defaultValue="0"
            app:useSimpleSummaryProvider="true" />

        <lineageos.preference.LineageSystemSettingListPreference
            android:key="status_bar_show_battery_percent"
            android:title="@string/status_bar_battery_percentage_title"
            android:summary="%s"
            android:dialogTitle="@string/status_bar_battery_percentage_title"
            android:entries="@array/status_bar_battery_percentage_entries"
            android:entryValues="@array/status_bar_battery_percentage_values"
            android:defaultValue="0" />
            android:defaultValue="0"
            app:useSimpleSummaryProvider="true" />

    </PreferenceCategory>

@@ -100,20 +101,20 @@
        <lineageos.preference.LineageSecureSettingListPreference
            android:key="qs_show_brightness_slider"
            android:title="@string/status_bar_brightness_slider_title"
            android:summary="%s"
            android:dialogTitle="@string/status_bar_brightness_slider_title"
            android:entries="@array/status_bar_brightness_slider_entries"
            android:entryValues="@array/status_bar_brightness_slider_values"
            android:defaultValue="1" />
            android:defaultValue="1"
            app:useSimpleSummaryProvider="true" />

        <lineageos.preference.LineageSecureSettingListPreference
            android:key="qs_brightness_slider_position"
            android:title="@string/status_bar_brightness_slider_position_title"
            android:summary="%s"
            android:dependency="qs_show_brightness_slider"
            android:entries="@array/status_bar_brightness_slider_position_entries"
            android:entryValues="@array/status_bar_brightness_slider_position_values"
            android:defaultValue="0" />
            android:defaultValue="0"
            app:useSimpleSummaryProvider="true" />

        <lineageos.preference.LineageSecureSettingSwitchPreference
            android:key="qs_show_auto_brightness"
+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class TouchscreenGestureSettings extends SettingsPreferenceFragment
            setDefaultValue(String.valueOf(defaultAction));
            setIcon(getIconDrawableResourceForAction(defaultAction));

            setSummary("%s");
            setSummaryProvider(ListPreference.SimpleSummaryProvider.getInstance());
            setDialogTitle(R.string.touchscreen_gesture_action_dialog_title);
            setTitle(ResourceUtils.getLocalizedString(
                    context.getResources(), gesture.name, TOUCHSCREEN_GESTURE_TITLE));