merged upstream/dev

This commit is contained in:
Ritvik Saraf 2018-12-04 23:19:57 +05:30
commit 9b84046865
126 changed files with 4459 additions and 1420 deletions

View file

@ -22,6 +22,14 @@
android:title="@string/show_hold_to_append_title"
android:summary="@string/show_hold_to_append_summary"/>
<ListPreference
android:defaultValue="@string/list_view_mode_value"
android:entries="@array/list_view_mode_description"
android:entryValues="@array/list_view_mode_values"
android:key="@string/list_view_mode_key"
android:summary="%s"
android:title="@string/list_view_mode"/>
<Preference
android:key="@string/caption_settings_key"
android:title="@string/caption_setting_title"

View file

@ -10,15 +10,13 @@
android:summary="%s"
android:title="@string/default_content_country_title"/>
<!-- TODO: add support for this within code
<ListPreference
android:defaultValue="@string/default_language_value"
android:entries="@array/language_names"
android:entryValues="@array/language_codes"
android:key="@string/search_language_key"
android:key="@string/content_language_key"
android:summary="%s"
android:title="@string/search_language_title"/>
-->
android:title="@string/content_language_title"/>
<SwitchPreference
android:defaultValue="false"
@ -31,12 +29,6 @@
android:summary="@string/show_search_suggestions_summary"
android:title="@string/show_search_suggestions_title"/>
<SwitchPreference
android:defaultValue="false"
android:key="@string/auto_queue_key"
android:summary="@string/auto_queue_summary"
android:title="@string/auto_queue_title"/>
<SwitchPreference
android:defaultValue="true"
android:key="@string/download_thumbnail_key"

View file

@ -64,12 +64,6 @@
android:key="@string/use_external_audio_player_key"
android:title="@string/use_external_audio_player_title"/>
<SwitchPreference
android:defaultValue="false"
android:key="@string/use_old_player_key"
android:summary="@string/use_old_player_summary"
android:title="@string/use_old_player_title"/>
<SwitchPreference
android:defaultValue="false"
android:key="@string/show_play_with_kodi_key"
@ -98,6 +92,12 @@
android:summary="@string/minimize_on_exit_summary"
android:title="@string/minimize_on_exit_title"/>
<SwitchPreference
android:defaultValue="false"
android:key="@string/auto_queue_key"
android:summary="@string/auto_queue_summary"
android:title="@string/auto_queue_title"/>
<SwitchPreference
android:defaultValue="false"
android:key="@string/resume_on_audio_focus_gain_key"
@ -106,9 +106,15 @@
<SwitchPreference
android:defaultValue="true"
android:key="@string/player_gesture_controls_key"
android:summary="@string/player_gesture_controls_summary"
android:title="@string/player_gesture_controls_title"/>
android:key="@string/volume_gesture_control_key"
android:summary="@string/volume_gesture_control_summary"
android:title="@string/volume_gesture_control_title"/>
<SwitchPreference
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
android:defaultValue="true"