merged upstream/dev

This commit is contained in:
Ritvik Saraf 2019-02-16 02:06:18 +05:30
commit df6bae4712
31 changed files with 405 additions and 56 deletions

View file

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/content">
<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="@string/default_country_value"
android:entries="@array/country_names"
android:entryValues="@array/country_codes"
@ -11,6 +13,7 @@
android:title="@string/default_content_country_title"/>
<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="@string/default_language_value"
android:entries="@array/language_names"
android:entryValues="@array/language_codes"
@ -19,17 +22,20 @@
android:title="@string/content_language_title"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="@string/show_age_restricted_content"
android:title="@string/show_age_restricted_content_title"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/show_search_suggestions_key"
android:summary="@string/show_search_suggestions_summary"
android:title="@string/show_search_suggestions_title"/>
<SwitchPreference
app:iconSpaceReserved="false"
android:defaultValue="true"
android:key="@string/download_thumbnail_key"
android:title="@string/download_thumbnail_title"
@ -42,11 +48,13 @@
android:summary="@string/show_comments_summary"/>
<Preference
app:iconSpaceReserved="false"
android:summary="@string/import_data_summary"
android:key="@string/import_data"
android:title="@string/import_data_title"/>
<Preference
app:iconSpaceReserved="false"
android:title="@string/export_data_title"
android:key="@string/export_data"
android:summary="@string/export_data_summary"/>