diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-02 14:13:09 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-02 14:13:09 +0100 |
commit | 6eaf45940e415ba66ed28b339d63bac9d8623718 (patch) | |
tree | d21a37f42ffca30502843cf19acd0c9469304d54 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | |
parent | f916c8f5af5fd46037dd7d4be28155dac67b1634 (diff) | |
download | open-keychain-6eaf45940e415ba66ed28b339d63bac9d8623718.tar.gz open-keychain-6eaf45940e415ba66ed28b339d63bac9d8623718.tar.bz2 open-keychain-6eaf45940e415ba66ed28b339d63bac9d8623718.zip |
Switch from ActionBarSherlock to ActionBarCompat
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index f73681f54..b38beebd1 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -28,12 +28,11 @@ import android.content.Intent; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; +import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; +import android.support.v7.app.ActionBarActivity; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockPreferenceActivity; - -public class PreferencesActivity extends SherlockPreferenceActivity { +public class PreferencesActivity extends PreferenceActivity { private IntegerListPreference mPassPhraseCacheTtl = null; private IntegerListPreference mEncryptionAlgorithm = null; private IntegerListPreference mHashAlgorithm = null; @@ -49,10 +48,10 @@ public class PreferencesActivity extends SherlockPreferenceActivity { mPreferences = Preferences.getPreferences(this); super.onCreate(savedInstanceState); - final ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(false); - actionBar.setHomeButtonEnabled(false); +// final ActionBar actionBar = getSupportActionBar(); +// actionBar.setDisplayShowTitleEnabled(true); +// actionBar.setDisplayHomeAsUpEnabled(false); +// actionBar.setHomeButtonEnabled(false); addPreferencesFromResource(R.xml.preferences); |