merged commits from origin

This commit is contained in:
Adam Howard 2015-11-10 12:43:40 +00:00
commit 9e7d9ee973
8 changed files with 104 additions and 41 deletions

View file

@ -48,13 +48,16 @@
<CheckBoxPreference
android:key="@string/showNextVideo"
android:title="@string/showNextVideoTitle"
android:title="@string/showNextAndSimilarTitle"
android:defaultValue="true" />
<!-- This function is not yet available
<ListPreference
android:key="@string/searchLanguage"
android:title="@string/searchLanguageTitle"
android:entries="@array/languageNames"
android:entryValues="@array/languageCodes"
android:defaultValue="" /> <!-- default will include no country code in URL-->
android:defaultValue="en" />
-->
</PreferenceScreen>