mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +01:00
Merge branch 'master' into directNearbyUploadsNew
This commit is contained in:
commit
50d9cff8c6
152 changed files with 2687 additions and 945 deletions
|
|
@ -1,54 +1,67 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
>
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<ListPreference
|
||||
android:key="defaultLicense"
|
||||
android:title="@string/preference_license"
|
||||
android:entries="@array/pref_defaultLicense_entries"
|
||||
android:entryValues="@array/pref_defaultLicense_values"
|
||||
android:defaultValue="@string/license_pref_cc_by_sa_4_0"
|
||||
/>
|
||||
<PreferenceCategory
|
||||
android:title="@string/preference_category_appearance">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="allowGps"
|
||||
android:title="@string/allow_gps"
|
||||
android:defaultValue="false"
|
||||
android:summary="@string/allow_gps_summary"
|
||||
/>
|
||||
<SwitchPreference
|
||||
android:title="@string/preference_theme"
|
||||
android:defaultValue="false"
|
||||
android:summary="@string/preference_theme_summary"
|
||||
android:key="theme" />
|
||||
|
||||
<Preference android:title="@string/become_a_tester_title"
|
||||
android:summary="@string/become_a_tester_description">
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:data="@string/beta_opt_in_link" />
|
||||
</Preference>
|
||||
</PreferenceCategory>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:title="@string/preference_theme"
|
||||
android:defaultValue="false"
|
||||
android:summary="@string/preference_theme_summary"
|
||||
android:key="theme"
|
||||
/>
|
||||
<PreferenceCategory
|
||||
android:title="@string/preference_category_general">
|
||||
|
||||
<EditTextPreference
|
||||
android:key="uploads"
|
||||
android:defaultValue="100"
|
||||
android:title= "@string/set_limit"
|
||||
android:inputType="numberDecimal"
|
||||
android:maxLength="3"
|
||||
/>
|
||||
<ListPreference
|
||||
android:key="defaultLicense"
|
||||
android:title="@string/preference_license"
|
||||
android:entries="@array/pref_defaultLicense_entries"
|
||||
android:entryValues="@array/pref_defaultLicense_values"
|
||||
android:defaultValue="@string/license_pref_cc_by_sa_4_0" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="useExternalStorage"
|
||||
android:title="@string/use_external_storage"
|
||||
android:defaultValue="true"
|
||||
android:summary="@string/use_external_storage_summary"
|
||||
/>
|
||||
<SwitchPreference
|
||||
android:key="useExternalStorage"
|
||||
android:title="@string/use_external_storage"
|
||||
android:defaultValue="true"
|
||||
android:summary="@string/use_external_storage_summary" />
|
||||
|
||||
<Preference
|
||||
android:key="sendLogFile"
|
||||
android:title="@string/send_log_file"
|
||||
android:summary="@string/send_log_file_description"/>
|
||||
<EditTextPreference
|
||||
android:key="uploads"
|
||||
android:defaultValue="100"
|
||||
android:title= "@string/set_limit"
|
||||
android:inputType="numberDecimal"
|
||||
android:maxLength="3" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="@string/preference_category_location">
|
||||
|
||||
<SwitchPreference
|
||||
android:key="allowGps"
|
||||
android:title="@string/allow_gps"
|
||||
android:defaultValue="false"
|
||||
android:summary="@string/allow_gps_summary" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="@string/preference_category_feedback">
|
||||
|
||||
<Preference android:title="@string/become_a_tester_title"
|
||||
android:summary="@string/become_a_tester_description">
|
||||
<intent android:action="android.intent.action.VIEW"
|
||||
android:data="@string/beta_opt_in_link" />
|
||||
</Preference>
|
||||
|
||||
<Preference
|
||||
android:key="sendLogFile"
|
||||
android:title="@string/send_log_file"
|
||||
android:summary="@string/send_log_file_description"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Loading…
Add table
Add a link
Reference in a new issue