rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove manual compat dependencies in settings

Browse Source
This commit is contained in:
J-Jamet
2018-03-19 16:49:26 +01:00
parent 758914a80a
commit 1f06b09d38
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/res/xml/app_preferences.xml
View File

@@ -17,28 +17,28 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/general">
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:summary="@string/omitbackup_summary"
android:defaultValue="@bool/omitbackup_default"
android:title="@string/omitbackup_title"
android:key="@string/omitbackup_key"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:summary="@string/use_saf_summary"
android:defaultValue="@bool/saf_default"
android:title="@string/use_saf_title"
android:key="@string/saf_key"/>
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/lock">
<android.support.v7.preference.ListPreference
<ListPreference
android:key="@string/clipboard_timeout_key"
android:title="@string/clipboard_timeout"
android:summary="@string/clipboard_timeout_summary"
@@ -46,7 +46,7 @@
android:entryValues="@array/clipboard_timeout_values"
android:dialogTitle="@string/clipboard_timeout"
android:defaultValue="@string/clipboard_timeout_default"/>
<android.support.v7.preference.ListPreference
<ListPreference
android:key="@string/app_timeout_key"
android:title="@string/app_timeout"
android:summary="@string/app_timeout_summary"
@@ -54,17 +54,17 @@
android:entryValues="@array/clipboard_timeout_values"
android:dialogTitle="@string/app_timeout"
android:defaultValue="@string/clipboard_timeout_default"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/lock_database_screen_off_key"
android:title="@string/lock_database_screen_off_title"
android:summary="@string/lock_database_screen_off_summary"
android:defaultValue="@bool/lock_database_screen_off_default"/>
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/password">
<android.support.v7.preference.SeekBarPreference
<SeekBarPreference
android:key="@string/password_length_key"
android:title="@string/password_size_title"
android:summary="@string/password_size_summary"
@@ -72,7 +72,7 @@
app:min="@string/min_password_length"
android:max="@string/max_password_length" />
<android.support.v14.preference.MultiSelectListPreference
<MultiSelectListPreference
android:key="@string/list_password_generator_options_key"
android:title="@string/list_password_generator_options_title"
android:summary="@string/list_password_generator_options_summary"
@@ -80,57 +80,57 @@
android:entryValues="@array/list_password_generator_options_values"
android:defaultValue="@array/list_password_generator_options_default_values"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/maskpass_key"
android:title="@string/maskpass_title"
android:summary="@string/maskpass_summary"
android:defaultValue="@bool/maskpass_default"/>
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/history">
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:summary="@string/recentfile_summary"
android:defaultValue="@bool/recentfile_default"
android:title="@string/recentfile_title"
android:key="@string/recentfile_key"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/keyfile_key"
android:title="@string/remember_keyfile_title"
android:summary="@string/remember_keyfile_summary"
android:dependency="@string/recentfile_key"
android:defaultValue="@bool/keyfile_default"/>
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/fingerprint">
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/fingerprint_enable_key"
android:title="@string/fingerprint_enable_title"
android:summary="@string/fingerprint_enable_summary"
android:defaultValue="@bool/fingerprint_enable_default"/>
<android.support.v7.preference.Preference
<Preference
android:key="@string/fingerprint_delete_all_key"
android:title="@string/fingerprint_delete_all_title"
android:summary="@string/fingerprint_delete_all_summary" />
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/appearance">
<android.support.v7.preference.ListPreference
<ListPreference
android:title="@string/style_choose_title"
android:summary="@string/style_choose_summary"
android:key="@string/setting_style_key"
android:defaultValue="@string/list_style_name_light"
android:entries="@array/list_style_names"
android:entryValues="@array/list_style_values" />
<android.support.v7.preference.ListPreference
<ListPreference
android:key="@string/list_size_key"
android:title="@string/list_size_title"
android:summary="@string/list_size_summary"
@@ -138,16 +138,16 @@
android:entryValues="@array/list_size_values"
android:dialogTitle="@string/list_size_summary"
android:defaultValue="@string/list_size_default"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/monospace_font_fields_enable_key"
android:title="@string/monospace_font_fields_enable_title"
android:summary="@string/monospace_font_fields_enable_summary"
android:defaultValue="@bool/monospace_font_fields_enable_default"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/full_file_path_enable_key"
android:title="@string/full_file_path_enable_title"
android:summary="@string/full_file_path_enable_summary"
android:defaultValue="@bool/full_file_path_enable_default"/>
</android.support.v7.preference.PreferenceCategory>
</android.support.v7.preference.PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>

12
app/src/main/res/xml/db_preferences.xml
View File

@@ -17,13 +17,13 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v7.preference.PreferenceScreen
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/general">
<android.support.v7.preference.Preference
<Preference
android:key="@string/algorithm_key"
android:persistent="false"
android:title="@string/algorithm"
@@ -35,7 +35,7 @@
android:positiveButtonText="@string/entry_save"
android:negativeButtonText="@string/entry_cancel"
android:enabled="false"/>
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/recycle_bin_key"
android:persistent="false"
android:title="@string/recycle_bin_title"
@@ -43,5 +43,5 @@
android:enabled="false"
android:checked="false"/>
</android.support.v7.preference.PreferenceCategory>
</android.support.v7.preference.PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>

10
app/src/main/res/xml/form_filling_preferences.xml
View File

@@ -18,21 +18,21 @@
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/autofill">
<SwitchPreference
android:title="@string/set_autofill_service_title"
android:summary="@string/set_autofill_service_summary"
android:defaultValue="@bool/settings_autofill_enable_default"
android:key="@string/settings_autofill_enable_key"/>
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/notifications">
<android.support.v14.preference.SwitchPreference
<SwitchPreference
android:key="@string/clipboard_notifications_key"
android:title="@string/clipboard_notifications_title"
android:defaultValue="@bool/clipboard_notifications_default"
android:summary="@string/clipboard_notifications_summary" />
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
</PreferenceScreen>

18
app/src/main/res/xml/preferences.xml
View File

@@ -17,26 +17,26 @@
You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto">
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/application">
<android.support.v7.preference.Preference
<Preference
android:key="@string/app_key"
android:title="@string/menu_app_settings"
android:icon="@drawable/ic_phone_android_prefs_24dp"
android:persistent="false" />
<android.support.v7.preference.Preference
<Preference
android:key="@string/settings_form_filling_key"
android:title="@string/menu_form_filling_settings"
android:icon="@drawable/ic_content_paste_prefs_24dp"
android:persistent="false" />
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
<android.support.v7.preference.PreferenceCategory
<PreferenceCategory
android:title="@string/database">
<android.support.v7.preference.Preference
<Preference
android:key="@string/db_key"
android:title="@string/menu_db_settings"
android:icon="@drawable/ic_data_usage_prefs_24dp"
@@ -48,6 +48,6 @@
custom:description="@string/rounds_fix_explanation"
android:defaultValue="@integer/roundsFix_default"
android:icon="@drawable/ic_filter_tilt_shift_pref_24dp" />
</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>
</android.support.v7.preference.PreferenceScreen>
</PreferenceScreen>