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

Conflict resolution

Browse source
This commit is contained in:
krtkush 2018-11-23 01:41:47 +05:30
commit 26e22f97ee
113 changed files with 4336 additions and 868 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/xml/appearance_settings.xml
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"

6
app/src/main/res/xml/content_settings.xml
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"

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

@ -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"