merged upstream/dev
This commit is contained in:
commit
9b84046865
126 changed files with 4459 additions and 1420 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue