diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-14 02:03:20 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-14 02:03:20 +0100 |
commit | 5517b4f8cf471c29dd881baec58efd450f6cd5ad (patch) | |
tree | c43b1c009d8b0d3a2ce22ea82ace4056463513f5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | |
parent | 318d3eb1201b849dfc6e0b474a4c3d62bfe8386a (diff) | |
download | open-keychain-5517b4f8cf471c29dd881baec58efd450f6cd5ad.tar.gz open-keychain-5517b4f8cf471c29dd881baec58efd450f6cd5ad.tar.bz2 open-keychain-5517b4f8cf471c29dd881baec58efd450f6cd5ad.zip |
Launcher icon fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index 51fac4779..1769caa47 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; @@ -33,8 +32,8 @@ import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.openpgp.PGPEncryptedData; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.ui.widget.IntegerListPreference; +import org.sufficientlysecure.keychain.util.Preferences; import java.util.List; @@ -130,9 +129,6 @@ public class PreferencesActivity extends PreferenceActivity { initializeUseNumKeypadForYubikeyPin( (CheckBoxPreference) findPreference(Constants.Pref.USE_NUMKEYPAD_FOR_YUBIKEY_PIN)); - } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { - // Load the legacy preferences headers - addPreferencesFromResource(R.xml.preference_headers_legacy); } } |