Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into pr3178

Browse source
This commit is contained in:
Stypox 2020-09-08 23:58:10 +02:00
commit a13e6b69e3
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
81 changed files with 318 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/values/settings_keys.xml
View file

@ -212,7 +212,6 @@
<string name="playback_skip_silence_key" translatable="false">playback_skip_silence_key</string>
<string name="app_language_key" translatable="false">app_language_key</string>
<string name="enable_lock_screen_video_thumbnail_key" translatable="false">enable_lock_screen_video_thumbnail</string>
<string name="feed_update_threshold_key" translatable="false">feed_update_threshold_key</string>
<string name="feed_update_threshold_default_value" translatable="false">300</string>
@ -249,6 +248,11 @@
<string name="clear_playback_states_key" translatable="false">clear_playback_states</string>
<string name="clear_search_history_key" translatable="false">clear_search_history</string>
<string name="last_used_download_type" translatable="false">@string/last_download_type_video_key</string>
<string name="last_download_type_video_key" translatable="false">last_dl_type_video</string>
<string name="last_download_type_audio_key" translatable="false">last_dl_type_audio</string>
<string name="last_download_type_subtitle_key" translatable="false">last_dl_type_subtitle</string>
<string name="downloads_storage_ask" translatable="false">downloads_storage_ask</string>
<string name="storage_use_saf" translatable="false">storage_use_saf</string>

2
app/src/main/res/xml/appearance_settings.xml
View file

@ -12,7 +12,7 @@
android:title="@string/theme_title"
app:iconSpaceReserved="false" />
<SwitchPreference
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_hold_to_append_key"
android:summary="@string/show_hold_to_append_summary"

14
app/src/main/res/xml/content_settings.xml
View file

@ -45,39 +45,39 @@
android:title="@string/peertube_instance_url_title"
android:summary="@string/peertube_instance_url_summary"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/show_age_restricted_content"
android:title="@string/show_age_restricted_content_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/youtube_restricted_mode_enabled"
android:title="@string/youtube_restricted_mode_enabled_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/show_search_suggestions_key"
android:summary="@string/show_search_suggestions_summary"
android:title="@string/show_search_suggestions_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/download_thumbnail_key"
android:title="@string/download_thumbnail_title"
android:summary="@string/download_thumbnail_summary"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/show_next_video_key"
android:title="@string/show_next_and_similar_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/show_comments_key"
@ -109,7 +109,7 @@
android:title="@string/feed_update_threshold_title"
android:summary="@string/feed_update_threshold_summary"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/feed_use_dedicated_fetch_method_key"

6
app/src/main/res/xml/debug_settings.xml
View file

@ -5,21 +5,21 @@
android:key="general_preferences"
android:title="@string/settings_category_debug_title">
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/allow_heap_dumping_key"
android:title="@string/enable_leak_canary_title"
android:summary="@string/enable_leak_canary_summary"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/allow_disposed_exceptions_key"
android:title="@string/enable_disposed_exceptions_title"
android:summary="@string/enable_disposed_exceptions_summary"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/show_original_time_ago_key"

6
app/src/main/res/xml/download_settings.xml
View file

@ -12,7 +12,7 @@
android:summary="@string/downloads_storage_ask_summary_kitkat"
android:title="@string/downloads_storage_ask_title" />
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/storage_use_saf"
@ -58,14 +58,14 @@
android:summary="@string/max_retry_desc"
android:title="@string/max_retry_msg" />
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/downloads_cross_network"
android:summary="@string/pause_downloads_on_mobile_desc"
android:title="@string/pause_downloads_on_mobile" />
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/downloads_queue_limit"

8
app/src/main/res/xml/history_settings.xml
View file

@ -4,14 +4,14 @@
android:key="general_preferences"
android:title="@string/settings_category_history_title">
<SwitchPreference
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/enable_watch_history_key"
android:summary="@string/enable_watch_history_summary"
android:title="@string/enable_watch_history_title"
app:iconSpaceReserved="false" />
<SwitchPreference
<SwitchPreferenceCompat
android:defaultValue="true"
android:dependency="@string/enable_watch_history_key"
android:key="@string/enable_playback_resume_key"
@ -19,14 +19,14 @@
android:title="@string/enable_playback_resume_title"
app:iconSpaceReserved="false" />
<SwitchPreference
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/enable_playback_state_lists_key"
android:summary="@string/enable_playback_state_lists_summary"
android:title="@string/enable_playback_state_lists_title"
app:iconSpaceReserved="false" />
<SwitchPreference
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/enable_search_history_key"
android:summary="@string/enable_search_history_summary"

2
app/src/main/res/xml/update_settings.xml
View file

@ -5,7 +5,7 @@
android:key="general_preferences"
android:title="@string/settings_category_updates_title">
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/update_app_key"

22
app/src/main/res/xml/video_audio_settings.xml
View file

@ -31,7 +31,7 @@
android:summary="%s"
android:title="@string/limit_mobile_data_usage_title" />
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/show_higher_resolutions_key"
@ -61,20 +61,20 @@
android:layout="@layout/settings_category_header_layout"
android:title="@string/settings_category_player_title">
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/use_external_video_player_key"
android:summary="@string/use_external_video_player_summary"
android:title="@string/use_external_video_player_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/use_external_audio_player_key"
android:title="@string/use_external_audio_player_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/show_play_with_kodi_key"
@ -114,42 +114,42 @@
android:summary="@string/autoplay_summary"
android:title="@string/autoplay_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/auto_queue_key"
android:summary="@string/auto_queue_summary"
android:title="@string/auto_queue_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/resume_on_audio_focus_gain_key"
android:summary="@string/resume_on_audio_focus_gain_summary"
android:title="@string/resume_on_audio_focus_gain_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/volume_gesture_control_key"
android:summary="@string/volume_gesture_control_summary"
android:title="@string/volume_gesture_control_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/brightness_gesture_control_key"
android:summary="@string/brightness_gesture_control_summary"
android:title="@string/brightness_gesture_control_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/popup_remember_size_pos_key"
android:summary="@string/popup_remember_size_pos_summary"
android:title="@string/popup_remember_size_pos_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/use_inexact_seek_key"
@ -165,7 +165,7 @@
android:summary="%s"
android:title="@string/seek_duration_title"/>
<SwitchPreference
<SwitchPreferenceCompat
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/clear_queue_confirmation_key"