Skip to content

Commit 4070007

Browse files
authored
Merge pull request TeamNewPipe#9011 from TacoTheDank/useSimpleSummaryProvider
Utilize useSimpleSummaryProvider attribute
2 parents 5b213a1 + fe227d5 commit 4070007

5 files changed

Lines changed: 32 additions & 32 deletions

File tree

app/src/main/res/xml/appearance_settings.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
android:entries="@array/theme_description_list"
99
android:entryValues="@array/theme_values_list"
1010
android:key="@string/theme_key"
11-
android:summary="%s"
1211
android:title="@string/theme_title"
1312
app:singleLineTitle="false"
14-
app:iconSpaceReserved="false" />
13+
app:iconSpaceReserved="false"
14+
app:useSimpleSummaryProvider="true" />
1515

1616
<ListPreference
1717
android:defaultValue="@string/default_night_theme_value"
@@ -44,20 +44,20 @@
4444
android:entries="@array/tablet_mode_description"
4545
android:entryValues="@array/tablet_mode_values"
4646
android:key="@string/tablet_mode_key"
47-
android:summary="%s"
4847
android:title="@string/tablet_mode_title"
4948
app:singleLineTitle="false"
50-
app:iconSpaceReserved="false" />
49+
app:iconSpaceReserved="false"
50+
app:useSimpleSummaryProvider="true" />
5151

5252
<ListPreference
5353
android:defaultValue="@string/list_view_mode_value"
5454
android:entries="@array/list_view_mode_description"
5555
android:entryValues="@array/list_view_mode_values"
5656
android:key="@string/list_view_mode_key"
57-
android:summary="%s"
5857
android:title="@string/list_view_mode"
5958
app:singleLineTitle="false"
60-
app:iconSpaceReserved="false" />
59+
app:iconSpaceReserved="false"
60+
app:useSimpleSummaryProvider="true" />
6161

6262
<Preference
6363
android:key="@string/caption_settings_key"

app/src/main/res/xml/content_settings.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
android:entries="@array/app_language_name"
99
android:entryValues="@array/app_language_code"
1010
android:key="@string/app_language_key"
11-
android:summary="%s"
1211
android:title="@string/app_language_title"
1312
app:singleLineTitle="false"
14-
app:iconSpaceReserved="false" />
13+
app:iconSpaceReserved="false"
14+
app:useSimpleSummaryProvider="true" />
1515

1616
<ListPreference
1717
android:defaultValue="@string/default_localization_key"
1818
android:entries="@array/language_names"
1919
android:entryValues="@array/language_codes"
2020
android:key="@string/content_language_key"
21-
android:summary="%s"
2221
android:title="@string/content_language_title"
2322
app:singleLineTitle="false"
24-
app:iconSpaceReserved="false" />
23+
app:iconSpaceReserved="false"
24+
app:useSimpleSummaryProvider="true" />
2525

2626
<ListPreference
2727
android:defaultValue="@string/default_localization_key"
2828
android:entries="@array/country_names"
2929
android:entryValues="@array/country_codes"
3030
android:key="@string/content_country_key"
31-
android:summary="%s"
3231
android:title="@string/default_content_country_title"
3332
app:singleLineTitle="false"
34-
app:iconSpaceReserved="false" />
33+
app:iconSpaceReserved="false"
34+
app:useSimpleSummaryProvider="true" />
3535

3636
<PreferenceScreen
3737
android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"

app/src/main/res/xml/download_settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
android:entries="@array/settings_filename_charset_name"
4141
android:entryValues="@array/settings_filename_charset"
4242
android:key="@string/settings_file_charset_key"
43-
android:summary="%s"
4443
android:title="@string/settings_file_charset_title"
4544
app:singleLineTitle="false"
46-
app:iconSpaceReserved="false" />
45+
app:iconSpaceReserved="false"
46+
app:useSimpleSummaryProvider="true" />
4747

4848
<EditTextPreference
4949
android:defaultValue="@string/settings_file_replacement_character_default_value"

app/src/main/res/xml/notifications_settings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
android:entries="@array/streams_notifications_interval_description"
1919
android:entryValues="@array/streams_notifications_interval_values"
2020
android:key="@string/streams_notifications_interval_key"
21-
android:summary="%s"
2221
android:title="@string/streams_notifications_interval_title"
2322
app:singleLineTitle="false"
24-
app:iconSpaceReserved="false" />
23+
app:iconSpaceReserved="false"
24+
app:useSimpleSummaryProvider="true" />
2525

2626
<ListPreference
2727
android:defaultValue="@string/streams_notifications_network_default"
2828
android:dependency="@string/enable_streams_notifications"
2929
android:entries="@array/streams_notifications_network_description"
3030
android:entryValues="@array/streams_notifications_network_values"
3131
android:key="@string/streams_notifications_network_key"
32-
android:summary="%s"
3332
android:title="@string/streams_notifications_network_title"
3433
app:singleLineTitle="false"
35-
app:iconSpaceReserved="false" />
34+
app:iconSpaceReserved="false"
35+
app:useSimpleSummaryProvider="true" />
3636

3737
<Preference
3838
android:fragment="org.schabi.newpipe.settings.notifications.NotificationModeConfigFragment"

app/src/main/res/xml/video_audio_settings.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
android:entries="@array/resolution_list_description"
99
android:entryValues="@array/resolution_list_values"
1010
android:key="@string/default_resolution_key"
11-
android:summary="%s"
1211
android:title="@string/default_resolution_title"
1312
app:singleLineTitle="false"
14-
app:iconSpaceReserved="false" />
13+
app:iconSpaceReserved="false"
14+
app:useSimpleSummaryProvider="true" />
1515

1616
<ListPreference
1717
android:defaultValue="@string/default_popup_resolution_value"
1818
android:entries="@array/resolution_list_description"
1919
android:entryValues="@array/resolution_list_values"
2020
android:key="@string/default_popup_resolution_key"
21-
android:summary="%s"
2221
android:title="@string/default_popup_resolution_title"
2322
app:singleLineTitle="false"
24-
app:iconSpaceReserved="false" />
23+
app:iconSpaceReserved="false"
24+
app:useSimpleSummaryProvider="true" />
2525

2626
<ListPreference
2727
android:defaultValue="@string/limit_mobile_data_usage_value"
2828
android:entries="@array/limit_data_usage_description_list"
2929
android:entryValues="@array/limit_data_usage_values_list"
3030
android:key="@string/limit_mobile_data_usage_key"
31-
android:summary="%s"
3231
android:title="@string/limit_mobile_data_usage_title"
3332
app:singleLineTitle="false"
34-
app:iconSpaceReserved="false" />
33+
app:iconSpaceReserved="false"
34+
app:useSimpleSummaryProvider="true" />
3535

3636
<SwitchPreferenceCompat
3737
android:defaultValue="false"
@@ -46,20 +46,20 @@
4646
android:entries="@array/video_format_description_list"
4747
android:entryValues="@array/video_format_values_list"
4848
android:key="@string/default_video_format_key"
49-
android:summary="%s"
5049
android:title="@string/default_video_format_title"
5150
app:singleLineTitle="false"
52-
app:iconSpaceReserved="false" />
51+
app:iconSpaceReserved="false"
52+
app:useSimpleSummaryProvider="true" />
5353

5454
<ListPreference
5555
android:defaultValue="@string/default_audio_format_value"
5656
android:entries="@array/audio_format_description_list"
5757
android:entryValues="@array/audio_format_values_list"
5858
android:key="@string/default_audio_format_key"
59-
android:summary="%s"
6059
android:title="@string/default_audio_format_title"
6160
app:singleLineTitle="false"
62-
app:iconSpaceReserved="false" />
61+
app:iconSpaceReserved="false"
62+
app:useSimpleSummaryProvider="true" />
6363

6464
<ListPreference
6565
android:defaultValue="@string/progressive_load_interval_default_value"
@@ -107,10 +107,10 @@
107107
android:entries="@array/seekbar_preview_thumbnail_type_description"
108108
android:entryValues="@array/seekbar_preview_thumbnail_type_key"
109109
android:key="@string/seekbar_preview_thumbnail_key"
110-
android:summary="%s"
111110
android:title="@string/seekbar_preview_thumbnail_title"
112111
app:singleLineTitle="false"
113-
app:iconSpaceReserved="false" />
112+
app:iconSpaceReserved="false"
113+
app:useSimpleSummaryProvider="true" />
114114

115115
</PreferenceCategory>
116116

@@ -211,10 +211,10 @@
211211
android:entries="@array/seek_duration_description"
212212
android:entryValues="@array/seek_duration_value"
213213
android:key="@string/seek_duration_key"
214-
android:summary="%s"
215214
android:title="@string/seek_duration_title"
216215
app:singleLineTitle="false"
217-
app:iconSpaceReserved="false" />
216+
app:iconSpaceReserved="false"
217+
app:useSimpleSummaryProvider="true" />
218218

219219
<SwitchPreferenceCompat
220220
android:defaultValue="false"

0 commit comments

Comments
 (0)