Launcher icon fixes

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);
         }
     }
 

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();

OpenKeychain/src/main/res/xml/preference_headers_legacy.xml

@@ -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>