greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'GitHub/master' into develop

Browse Source 
# Conflicts:
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/pref_general.xml
This commit is contained in:
Stefan Schüller 2020-06-19 08:37:15 +02:00
commit 341b62fa57
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/values/strings.xml
View File

@ -60,10 +60,11 @@
<string name="pref_title_peertube_server">PeerTube Server</string> <string name="pref_title_peertube_server">PeerTube Server</string>
<string name="pref_title_background_play">Background Playback</string> <string name="pref_title_background_play">Background Playback</string>
<string name="pref_description_background_play">If enabled, continues to play video in background.</string> <string name="pref_description_background_play">If enabled, continues to play video in background.</string>
<string name="pref_language_app">Application Language</string>
<string name="pref_description_language_app">Select language for application interface. Restart app for change to take effect.</string>
<string name="pref_title_back_pause">Pause on back button</string> <string name="pref_title_back_pause">Pause on back button</string>
<string name="pref_description_back_pause">Pause background play when pressing back during video playback.</string> <string name="pref_description_back_pause">Pause background play when pressing back during video playback.</string>
<string name="pref_language_app">Application Language</string>
<string name="pref_description_language_app">Select language for application interface. Restart app for change to take effect.</string>
<!-- languages --> <!-- languages -->
<string name="ab">Abkhazian</string> <string name="ab">Abkhazian</string>
<string name="aa">Afar</string> <string name="aa">Afar</string>

6
app/src/main/res/xml/pref_general.xml
View File

@ -30,6 +30,12 @@
android:summary="@string/pref_description_back_pause" android:summary="@string/pref_description_back_pause"
android:title="@string/pref_title_back_pause" /> android:title="@string/pref_title_back_pause" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_back_pause"
android:summary="@string/pref_description_back_pause"
android:title="@string/pref_title_back_pause" />
<ListPreference <ListPreference
android:defaultValue="@array/empty_array" android:defaultValue="@array/empty_array"
android:entries="@array/supportedLanguagesArray" android:entries="@array/supportedLanguagesArray"