Launcher icon fixes

11 files changed, 7 insertions, 20 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);
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
index 2a8ef171c..9e2e443af 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
@@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.ui.widget.KeyServerEditor;
 
 import java.util.Vector;
 
-public class PreferencesKeyServerActivity extends ActionBarActivity implements OnClickListener,
+public class PreferencesKeyServerActivity extends BaseActivity implements OnClickListener,
         EditorListener {
 
     public static final String EXTRA_KEY_SERVERS = "key_servers";
@@ -68,8 +68,6 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O
                 }
         );
 
-        setContentView(R.layout.key_server_preference);
-
         mInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
         mTitle = (TextView) findViewById(R.id.title);
@@ -102,6 +100,11 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O
         makeServerList(servers);
    }
 
+    @Override
+    protected void initLayout() {
+        setContentView(R.layout.key_server_preference);
+    }
+
     private void makeServerList(String[] servers) {
         if (servers != null) {
             mEditors.removeAllViews();
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
index 6b2be4bc3..6133816d2 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index c2b688424..000000000
--- a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png
deleted file mode 100644
index 45467992f..000000000
--- a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png
deleted file mode 100644
index c400a1820..000000000
--- a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
index 6bb29efde..d945a01de 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
index 6188bbed9..825b18b38 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
index 765738881..4809acc39 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
index d85507fef..fab324e93 100644
--- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
deleted file mode 100644
index 47b0a0920..000000000
--- a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
-        android:title="@string/section_general" >
-        <intent
-            android:action="org.sufficientlysecure.keychain.ui.PREFS_GEN" />
-    </Preference>
-    <Preference
-        android:title="@string/section_advanced" >
-        <intent
-            android:action="org.sufficientlysecure.keychain.ui.PREFS_ADV" />
-    </Preference>
-</PreferenceScreen>