luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-28 01:36:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #183 from michaelschattgen/feature-applockdependency

Browse source 
Change auto lock preference visibility behaviour
This commit is contained in:
Alexander Bakker 2019-08-29 11:47:51 +02:00 • committed by GitHub
commit 0c87f06972
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
View file

@ -81,6 +81,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
private SwitchPreference _encryptionPreference; private SwitchPreference _encryptionPreference;
private SwitchPreference _fingerprintPreference; private SwitchPreference _fingerprintPreference;
private Preference _autoLockPreference;
private Preference _setPasswordPreference; private Preference _setPasswordPreference;
private Preference _slotsPreference; private Preference _slotsPreference;
private Preference _groupsPreference; private Preference _groupsPreference;
@ -333,6 +334,8 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
return true; return true;
} }
}); });
_autoLockPreference = findPreference("pref_auto_lock");
} }
@Override @Override
@ -659,6 +662,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
_setPasswordPreference.setVisible(encrypted); _setPasswordPreference.setVisible(encrypted);
_fingerprintPreference.setVisible(encrypted); _fingerprintPreference.setVisible(encrypted);
_slotsPreference.setEnabled(encrypted); _slotsPreference.setEnabled(encrypted);
_autoLockPreference.setVisible(encrypted);
if (encrypted) { if (encrypted) {
SlotList slots = _db.getCredentials().getSlots(); SlotList slots = _db.getCredentials().getSlots();

14
app/src/main/res/xml/preferences.xml
View file

@ -51,12 +51,6 @@
android:title="@string/pref_secure_screen_title" android:title="@string/pref_secure_screen_title"
android:summary="@string/pref_secure_screen_summary" android:summary="@string/pref_secure_screen_summary"
app:iconSpaceReserved="false"/> app:iconSpaceReserved="false"/>
<androidx.preference.SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_auto_lock"
android:title="@string/pref_auto_lock_title"
android:summary="@string/pref_auto_lock_summary"
app:iconSpaceReserved="false"/>
<androidx.preference.SwitchPreferenceCompat <androidx.preference.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="pref_tap_to_reveal" android:key="pref_tap_to_reveal"
@ -98,6 +92,14 @@
android:persistent="false" android:persistent="false"
app:iconSpaceReserved="false"/> app:iconSpaceReserved="false"/>
<androidx.preference.SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_auto_lock"
android:dependency="pref_encryption"
android:title="@string/pref_auto_lock_title"
android:summary="@string/pref_auto_lock_summary"
app:iconSpaceReserved="false"/>
<Preference <Preference
android:key="pref_slots" android:key="pref_slots"
android:title="@string/pref_slots_title" android:title="@string/pref_slots_title"