cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: change CheckBoxPreference to SwitchPreference

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-05-17 16:51:44 +02:00
parent 320909f3ce
commit a2d2da9098
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
View File

@@ -30,7 +30,6 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
@@ -213,7 +212,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
}); });
initializePassphraseCacheSubs( initializePassphraseCacheSubs(
(CheckBoxPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_SUBS)); (SwitchPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_SUBS));
} }
} }
@@ -592,7 +591,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|| super.isValidFragment(fragmentName); || super.isValidFragment(fragmentName);
} }
private static void initializePassphraseCacheSubs(final CheckBoxPreference mPassphraseCacheSubs) { private static void initializePassphraseCacheSubs(final SwitchPreference mPassphraseCacheSubs) {
mPassphraseCacheSubs.setChecked(sPreferences.getPassphraseCacheSubs()); mPassphraseCacheSubs.setChecked(sPreferences.getPassphraseCacheSubs());
mPassphraseCacheSubs.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { mPassphraseCacheSubs.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {

4
OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
View File

@@ -5,17 +5,13 @@
android:key="search_keyserver_pref" android:key="search_keyserver_pref"
android:summary="@string/pref_keyserver_summary" android:summary="@string/pref_keyserver_summary"
android:title="@string/pref_keyserver" /> android:title="@string/pref_keyserver" />
<PreferenceScreen <PreferenceScreen
android:dependency="search_keyserver_pref" android:dependency="search_keyserver_pref"
android:key="keyServers" android:key="keyServers"
android:persistent="false"
android:title="@string/label_keyservers" /> android:title="@string/label_keyservers" />
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="search_keybase_pref" android:key="search_keybase_pref"
android:summary="@string/pref_keybase_summary" android:summary="@string/pref_keybase_summary"
android:title="@string/pref_keybase" /> android:title="@string/pref_keybase" />
</PreferenceScreen> </PreferenceScreen>

8
OpenKeychain/src/main/res/xml/passphrase_preferences.xml
View File

@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen <PreferenceScreen
android:key="passphraseCacheTtls" android:key="passphraseCacheTtls"
android:persistent="false"
android:title="@string/label_passphrase_cache_ttl" /> android:title="@string/label_passphrase_cache_ttl" />
<CheckBoxPreference <SwitchPreference
android:key="passphraseCacheSubs" android:key="passphraseCacheSubs"
android:persistent="true"
android:title="@string/label_passphrase_cache_subs" /> android:title="@string/label_passphrase_cache_subs" />
<CheckBoxPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="useNumKeypadForYubikeyPin" android:key="useNumKeypadForYubikeyPin"
android:persistent="true"
android:title="@string/label_use_num_keypad_for_security_token_pin" /> android:title="@string/label_use_num_keypad_for_security_token_pin" />
</PreferenceScreen> </PreferenceScreen>