Switch from ActionBarSherlock to ActionBarCompat

42 files changed, 154 insertions, 424 deletions

diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index 58219356b..49442f163 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
     android:versionCode="22000"
-    android:versionName="2.2" >
+    android:versionName="2.2">
 
     <!--
         General remarks
@@ -56,13 +56,13 @@
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.Sherlock.Light" >
+        android:theme="@style/Theme.AppCompat.Light"
+        android:label="@string/app_name">
         <activity
             android:name=".ui.KeyListPublicActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/app_name"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -82,7 +82,7 @@
             android:name=".ui.KeyListSecretActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_manage_secret_keys"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop">
 
             <!-- <intent-filter> -->
             <!-- <action android:name="android.intent.action.SEARCH" /> -->
@@ -102,7 +102,7 @@
             android:name=".ui.ViewKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_key_details"
-            android:parentActivityName=".ui.KeyListPublicActivity" >
+            android:parentActivityName=".ui.KeyListPublicActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.KeyListPublicActivity" />
@@ -111,7 +111,7 @@
             android:name=".ui.ViewKeyActivityJB"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_key_details"
-            android:parentActivityName=".ui.KeyListPublicActivity" >
+            android:parentActivityName=".ui.KeyListPublicActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.KeyListPublicActivity" />
@@ -121,7 +121,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_select_recipients"
             android:launchMode="singleTop"
-            android:uiOptions="splitActionBarWhenNarrow" >
+            android:uiOptions="splitActionBarWhenNarrow">
 
             <!-- <intent-filter> -->
             <!-- <action android:name="android.intent.action.SEARCH" /> -->
@@ -136,7 +136,7 @@
             android:name=".ui.SelectSecretKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_select_secret_key"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop">
 
             <!-- <intent-filter> -->
             <!-- <action android:name="android.intent.action.SEARCH" /> -->
@@ -152,7 +152,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_encrypt"
             android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden">
 
             <!-- Keychain's own Actions -->
             <intent-filter>
@@ -163,7 +163,7 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
             <!-- Android's Send Action -->
-            <intent-filter android:label="@string/intent_send_encrypt" >
+            <intent-filter android:label="@string/intent_send_encrypt">
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -176,7 +176,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_decrypt"
             android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden">
 
             <!-- Keychain's own Actions -->
             <intent-filter>
@@ -187,7 +187,7 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
             <!-- Android's Send Action -->
-            <intent-filter android:label="@string/intent_send_decrypt" >
+            <intent-filter android:label="@string/intent_send_decrypt">
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -195,7 +195,7 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
             <!-- Linking "Decrypt" to file types -->
-            <intent-filter android:label="@string/intent_decrypt_file" >
+            <intent-filter android:label="@string/intent_decrypt_file">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -216,7 +216,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
             </intent-filter>
-            <intent-filter android:label="@string/intent_decrypt_file" >
+            <intent-filter android:label="@string/intent_decrypt_file">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -260,7 +260,7 @@
             android:name=".ui.ImportKeysActivity"
             android:label="@string/title_import_keys"
             android:launchMode="singleTop"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden">
 
             <!-- Handle URIs with fingerprints when scanning directly from Barcode Scanner -->
             <intent-filter>
@@ -285,7 +285,7 @@
                 <data android:mimeType="application/pgp-keys" />
             </intent-filter>
             <!-- Keychain's own Actions -->
-            <intent-filter android:label="@string/intent_import_key" >
+            <intent-filter android:label="@string/intent_import_key">
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -293,14 +293,14 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
             <!-- IMPORT again without mimeType to also allow data only without filename -->
-            <intent-filter android:label="@string/intent_import_key" >
+            <intent-filter android:label="@string/intent_import_key">
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <!-- Linking "Import key" to file types -->
-            <intent-filter android:label="@string/intent_import_key" >
+            <intent-filter android:label="@string/intent_import_key">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -320,7 +320,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpg" />
             </intent-filter>
-            <intent-filter android:label="@string/intent_import_key" >
+            <intent-filter android:label="@string/intent_import_key">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -383,7 +383,7 @@
             android:name="org.sufficientlysecure.keychain.service.remote.OpenPgpService"
             android:enabled="true"
             android:exported="true"
-            android:process=":remote_api" >
+            android:process=":remote_api">
             <intent-filter>
                 <action android:name="org.openintents.openpgp.IOpenPgpService" />
             </intent-filter>
@@ -398,7 +398,7 @@
             android:name="org.sufficientlysecure.keychain.service.remote.ExtendedApiService"
             android:enabled="true"
             android:exported="true"
-            android:process=":remote_api" >
+            android:process=":remote_api">
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.service.remote.IExtendedApiService" />
             </intent-filter>
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
index e4aa6d229..1cb91c688 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
@@ -17,19 +17,18 @@
 
 package org.sufficientlysecure.keychain.compatibility;
 
+import android.support.v4.app.ListFragment;
 import android.view.View;
 import android.widget.ListView;
 
-import com.actionbarsherlock.app.SherlockListFragment;
-
 /**
  * Bug on Android >= 4.1
- * 
+ * <p/>
  * http://code.google.com/p/android/issues/detail?id=35885
- * 
+ * <p/>
  * Items are not checked in layout
  */
-public class ListFragmentWorkaround extends SherlockListFragment {
+public class ListFragmentWorkaround extends ListFragment {
 
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
index fee120273..b55075e6c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
@@ -22,15 +22,14 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.Log;
 
 import android.app.Activity;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
 public class ActionBarHelper {
 
     /**
@@ -38,7 +37,7 @@ public class ActionBarHelper {
      * 
      * @param activity
      */
-    public static void setBackButton(SherlockFragmentActivity activity) {
+    public static void setBackButton(ActionBarActivity activity) {
         // set actionbar without home button if called from another app
         final ActionBar actionBar = activity.getSupportActionBar();
         Log.d(Constants.TAG, "calling package (only set when using startActivityForResult)="
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
index 9b817cb50..21676a2a7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
@@ -34,17 +34,16 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.support.v7.app.ActionBarActivity;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
 public class ExportHelper {
     protected FileDialogFragment mFileDialog;
     protected String mExportFilename;
 
-    SherlockFragmentActivity activity;
+    ActionBarActivity activity;
 
-    public ExportHelper(SherlockFragmentActivity activity) {
+    public ExportHelper(ActionBarActivity activity) {
         super();
         this.activity = activity;
     }
@@ -63,9 +62,6 @@ public class ExportHelper {
 
     /**
      * Show dialog where to export keys
-     * 
-     * @param keyRingMasterKeyId
-     *            if -1 export all keys
      */
     public void showExportKeysDialog(final Uri dataUri, final int keyType,
             final String exportFilename) {
@@ -115,9 +111,6 @@ public class ExportHelper {
 
     /**
      * Export keys
-     * 
-     * @param keyRingMasterKeyId
-     *            if -1 export all keys
      */
     public void exportKeys(Uri dataUri, int keyType) {
         Log.d(Constants.TAG, "exportKeys started");
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
index 8d56fc593..a7afc9698 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
@@ -26,13 +26,12 @@ import org.sufficientlysecure.keychain.util.Log;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-
-public class AppSettingsActivity extends SherlockFragmentActivity {
+public class AppSettingsActivity extends ActionBarActivity {
     private Uri mAppUri;
 
     private AppSettingsFragment mSettingsFragment;
@@ -71,7 +70,7 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.api_app_settings, menu);
+        getMenuInflater().inflate(R.menu.api_app_settings, menu);
         return true;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
index 4c9d553ad..fed267a44 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -33,9 +34,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.actionbarsherlock.app.SherlockListFragment;
-
-public class RegisteredAppsListFragment extends SherlockListFragment implements
+public class RegisteredAppsListFragment extends ListFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     // This is the Adapter being used to display the list's data.
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
index de07989d8..f1e203733 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
@@ -36,12 +36,11 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
-public class RemoteServiceActivity extends SherlockFragmentActivity {
+public class RemoteServiceActivity extends ActionBarActivity {
 
     public static final String ACTION_REGISTER = Constants.INTENT_PREFIX + "API_ACTIVITY_REGISTER";
     public static final String ACTION_CACHE_PASSPHRASE = Constants.INTENT_PREFIX
@@ -165,7 +164,8 @@ public class RemoteServiceActivity extends SherlockFragmentActivity {
                             finishHandled = true;
                             finish();
                         }
-                    });
+                    }
+            );
 
             setContentView(R.layout.api_app_register_activity);
 
@@ -248,7 +248,8 @@ public class RemoteServiceActivity extends SherlockFragmentActivity {
                             finishHandled = true;
                             finish();
                         }
-                    });
+                    }
+            );
 
             setContentView(R.layout.api_app_select_pub_keys_activity);
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index a803e4680..6f5d8a489 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -55,6 +55,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
@@ -66,8 +68,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewFlipper;
 
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
 @SuppressLint("NewApi")
@@ -126,7 +126,6 @@ public class DecryptActivity extends DrawerActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-
         if (mDecryptEnabled) {
             menu.add(1, Id.menu.option.decrypt, 0, mDecryptString).setShowAsAction(
                     MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index ee8a01432..53a57c4cd 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
@@ -24,15 +24,14 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
-import android.view.ActionProvider;
-import android.view.ContextMenu.ContextMenuInfo;
+import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
-import android.view.SubMenu;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -40,17 +39,9 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
 import com.beardedhen.androidbootstrap.FontAwesomeText;
 
-/**
- * some fundamental ideas from https://github.com/tobykurien/SherlockNavigationDrawer
- * 
- * 
- */
-public class DrawerActivity extends SherlockFragmentActivity {
+public class DrawerActivity extends ActionBarActivity {
     private DrawerLayout mDrawerLayout;
     private ListView mDrawerList;
     private ActionBarDrawerToggle mDrawerToggle;
@@ -138,10 +129,10 @@ public class DrawerActivity extends SherlockFragmentActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item) {
         // The action bar home/up action should open or close the drawer.
         // ActionBarDrawerToggle will take care of this.
-        if (mDrawerToggle.onOptionsItemSelected(getMenuItem(item))) {
+        if (mDrawerToggle.onOptionsItemSelected(item)) {
             return true;
         }
 
@@ -178,214 +169,6 @@ public class DrawerActivity extends SherlockFragmentActivity {
         // }
     }
 
-    private android.view.MenuItem getMenuItem(final MenuItem item) {
-        return new android.view.MenuItem() {
-            @Override
-            public int getItemId() {
-                return item.getItemId();
-            }
-
-            public boolean isEnabled() {
-                return true;
-            }
-
-            @Override
-            public boolean collapseActionView() {
-                return false;
-            }
-
-            @Override
-            public boolean expandActionView() {
-                return false;
-            }
-
-            @Override
-            public ActionProvider getActionProvider() {
-                return null;
-            }
-
-            @Override
-            public View getActionView() {
-                return null;
-            }
-
-            @Override
-            public char getAlphabeticShortcut() {
-                return 0;
-            }
-
-            @Override
-            public int getGroupId() {
-                return 0;
-            }
-
-            @Override
-            public Drawable getIcon() {
-                return null;
-            }
-
-            @Override
-            public Intent getIntent() {
-                return null;
-            }
-
-            @Override
-            public ContextMenuInfo getMenuInfo() {
-                return null;
-            }
-
-            @Override
-            public char getNumericShortcut() {
-                return 0;
-            }
-
-            @Override
-            public int getOrder() {
-                return 0;
-            }
-
-            @Override
-            public SubMenu getSubMenu() {
-                return null;
-            }
-
-            @Override
-            public CharSequence getTitle() {
-                return null;
-            }
-
-            @Override
-            public CharSequence getTitleCondensed() {
-                return null;
-            }
-
-            @Override
-            public boolean hasSubMenu() {
-                return false;
-            }
-
-            @Override
-            public boolean isActionViewExpanded() {
-                return false;
-            }
-
-            @Override
-            public boolean isCheckable() {
-                return false;
-            }
-
-            @Override
-            public boolean isChecked() {
-                return false;
-            }
-
-            @Override
-            public boolean isVisible() {
-                return false;
-            }
-
-            @Override
-            public android.view.MenuItem setActionProvider(ActionProvider actionProvider) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setActionView(View view) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setActionView(int resId) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setAlphabeticShortcut(char alphaChar) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setCheckable(boolean checkable) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setChecked(boolean checked) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setEnabled(boolean enabled) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setIcon(Drawable icon) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setIcon(int iconRes) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setIntent(Intent intent) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setNumericShortcut(char numericChar) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setOnActionExpandListener(OnActionExpandListener listener) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setOnMenuItemClickListener(
-                    OnMenuItemClickListener menuItemClickListener) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setShortcut(char numericChar, char alphaChar) {
-                return null;
-            }
-
-            @Override
-            public void setShowAsAction(int actionEnum) {
-            }
-
-            @Override
-            public android.view.MenuItem setShowAsActionFlags(int actionEnum) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setTitle(CharSequence title) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setTitle(int title) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setTitleCondensed(CharSequence title) {
-                return null;
-            }
-
-            @Override
-            public android.view.MenuItem setVisible(boolean visible) {
-                return null;
-            }
-        };
-    }
-
     /* The click listener for ListView in the navigation drawer */
     private class DrawerItemClickListener implements ListView.OnItemClickListener {
         @Override
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index ac14427f8..558e793a7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -18,9 +18,7 @@
 package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Iterator;
 import java.util.Vector;
 
 import org.spongycastle.openpgp.PGPSecretKey;
@@ -54,7 +52,10 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -64,12 +65,9 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
-public class EditKeyActivity extends SherlockFragmentActivity {
+public class EditKeyActivity extends ActionBarActivity {
 
     // Actions for internal use only:
     public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY";
@@ -315,7 +313,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.key_edit, menu);
+        getMenuInflater().inflate(R.menu.key_edit, menu);
         return true;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 2ba726bfe..596dc9229 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -51,6 +51,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
@@ -63,8 +65,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewFlipper;
 
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class EncryptActivity extends DrawerActivity {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
index d604c1c86..2fe7c56e6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
@@ -28,13 +28,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.ActionBar.Tab;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
-public class HelpActivity extends SherlockFragmentActivity {
+public class HelpActivity extends ActionBarActivity {
     public static final String EXTRA_SELECTED_TAB = "selectedTab";
 
     ViewPager mViewPager;
@@ -100,7 +98,7 @@ public class HelpActivity extends SherlockFragmentActivity {
             }
         }
 
-        public TabsAdapter(SherlockFragmentActivity activity, ViewPager pager) {
+        public TabsAdapter(ActionBarActivity activity, ViewPager pager) {
             super(activity.getSupportFragmentManager());
             mContext = activity;
             mActionBar = activity.getSupportActionBar();
@@ -139,7 +137,7 @@ public class HelpActivity extends SherlockFragmentActivity {
         public void onPageScrollStateChanged(int state) {
         }
 
-        public void onTabSelected(Tab tab, FragmentTransaction ft) {
+        public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
             Object tag = tab.getTag();
             for (int i = 0; i < mTabs.size(); i++) {
                 if (mTabs.get(i) == tag) {
@@ -148,10 +146,10 @@ public class HelpActivity extends SherlockFragmentActivity {
             }
         }
 
-        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+        public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
         }
 
-        public void onTabReselected(Tab tab, FragmentTransaction ft) {
+        public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
         }
     }
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
index 840ebb650..be7c50dbb 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
@@ -26,14 +26,14 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragment;
 
-public class HelpFragmentAbout extends SherlockFragment {
+public class HelpFragmentAbout extends Fragment {
 
     /**
      * Workaround for Android Bug. See
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
index ce932fd70..fb6747db0 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
@@ -21,15 +21,14 @@ import org.sufficientlysecure.htmltextview.HtmlTextView;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
-import com.actionbarsherlock.app.SherlockFragment;
-
-public class HelpFragmentHtml extends SherlockFragment {
+public class HelpFragmentHtml extends Fragment {
     private Activity mActivity;
 
     private int htmlFile;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 52883749e..695e66314 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -44,16 +44,15 @@ import android.os.Messenger;
 import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBar;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
-public class ImportKeysActivity extends DrawerActivity implements OnNavigationListener {
+public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNavigationListener {
     public static final String ACTION_IMPORT_KEY = Constants.INTENT_PREFIX + "IMPORT_KEY";
     public static final String ACTION_IMPORT_KEY_FROM_QR_CODE = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_QR_CODE";
@@ -102,11 +101,11 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi
         // set drop down navigation
         mNavigationStrings = getResources().getStringArray(R.array.import_action_list);
         Context context = getSupportActionBar().getThemedContext();
-        ArrayAdapter<CharSequence> list = ArrayAdapter.createFromResource(context,
-                R.array.import_action_list, R.layout.sherlock_spinner_item);
-        list.setDropDownViewResource(R.layout.sherlock_spinner_dropdown_item);
+        ArrayAdapter<CharSequence> navigationAdapter = ArrayAdapter.createFromResource(context,
+                R.array.import_action_list, android.R.layout.simple_spinner_dropdown_item);
+//        list.setDropDownViewResource(R.layout.sherlock_spinner_dropdown_item);
         getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        getSupportActionBar().setListNavigationCallbacks(list, this);
+        getSupportActionBar().setListNavigationCallbacks(navigationAdapter, this);
 
         handleActions(savedInstanceState, getIntent());
     }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 3006b0820..68d318491 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -37,15 +37,14 @@ import org.sufficientlysecure.keychain.util.Log;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockListFragment;
-
-public class ImportKeysListFragment extends SherlockListFragment implements
+public class ImportKeysListFragment extends ListFragment implements
         LoaderManager.LoaderCallbacks<List<ImportKeysListEntry>> {
     private static final String ARG_DATA_URI = "uri";
     private static final String ARG_BYTES = "bytes";
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
index 1b8bfe6f3..4521786f7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
@@ -24,9 +24,8 @@ import org.sufficientlysecure.keychain.helper.ExportHelper;
 
 import android.content.Intent;
 import android.os.Bundle;
-
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
+import android.view.Menu;
+import android.view.MenuItem;
 
 public class KeyListPublicActivity extends DrawerActivity {
 
@@ -47,7 +46,7 @@ public class KeyListPublicActivity extends DrawerActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.key_list_public, menu);
+        getMenuInflater().inflate(R.menu.key_list_public, menu);
         return true;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
index 1ad9781ec..e58ebe819 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
@@ -24,9 +24,8 @@ import org.sufficientlysecure.keychain.helper.ExportHelper;
 
 import android.content.Intent;
 import android.os.Bundle;
-
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
+import android.view.Menu;
+import android.view.MenuItem;
 
 public class KeyListSecretActivity extends DrawerActivity {
 
@@ -47,7 +46,7 @@ public class KeyListSecretActivity extends DrawerActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.key_list_secret, menu);
+        getMenuInflater().inflate(R.menu.key_list_secret, menu);
         return true;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
index 0e2d22e1e..f2e6131f6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
@@ -33,6 +33,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -45,9 +46,7 @@ import android.widget.ListView;
 import android.widget.AbsListView.MultiChoiceModeListener;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.actionbarsherlock.app.SherlockListFragment;
-
-public class KeyListSecretFragment extends SherlockListFragment implements
+public class KeyListSecretFragment extends ListFragment implements
         LoaderManager.LoaderCallbacks<Cursor>, OnItemClickListener {
 
     private KeyListSecretActivity mKeyListSecretActivity;
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);
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
index 674510550..b5ac739ae 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
@@ -27,15 +27,14 @@ import org.sufficientlysecure.keychain.ui.widget.KeyServerEditor;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockActivity;
-
-public class PreferencesKeyServerActivity extends SherlockActivity implements OnClickListener,
+public class PreferencesKeyServerActivity extends ActionBarActivity implements OnClickListener,
         EditorListener {
 
     public static final String EXTRA_KEY_SERVERS = "key_servers";
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
index e1dfed12a..86ae0073f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
@@ -23,11 +23,10 @@ import org.sufficientlysecure.keychain.helper.ActionBarHelper;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-
-public class SelectPublicKeyActivity extends SherlockFragmentActivity {
+public class SelectPublicKeyActivity extends ActionBarActivity {
 
     // Actions for internal use only:
     public static final String ACTION_SELECT_PUBLIC_KEYS = Constants.INTENT_PREFIX
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
index 6bbab09b2..59b46dd00 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
@@ -78,7 +78,7 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mActivity = getSherlockActivity();
+        mActivity = getActivity();
         mListView = getListView();
 
         mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
index 57587cc75..cd3b2cf78 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
@@ -22,12 +22,11 @@ import org.sufficientlysecure.keychain.R;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-
-public class SelectSecretKeyActivity extends SherlockFragmentActivity {
+public class SelectSecretKeyActivity extends ActionBarActivity {
 
     // Actions for internal use only:
     public static final String ACTION_SELECT_SECRET_KEY = Constants.INTENT_PREFIX
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
index 6083ba00d..8ee2d381e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
@@ -31,6 +31,7 @@ import org.sufficientlysecure.keychain.ui.adapter.SelectKeyCursorAdapter;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -39,9 +40,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.actionbarsherlock.app.SherlockListFragment;
-
-public class SelectSecretKeyFragment extends SherlockListFragment implements
+public class SelectSecretKeyFragment extends ListFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     private SelectSecretKeyActivity mActivity;
@@ -80,7 +79,7 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mActivity = (SelectSecretKeyActivity) getSherlockActivity();
+        mActivity = (SelectSecretKeyActivity) getActivity();
         mListView = getListView();
 
         mListView.setOnItemClickListener(new OnItemClickListener() {
@@ -116,9 +115,9 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements
         // sample only has one Loader, so we don't care about the ID.
         Uri baseUri = KeyRings.buildSecretKeyRingsUri();
 
-        String CapFilter = null;
+        String capFilter = null;
         if (mFilterCertify) {
-            CapFilter = "(cert > 0)";
+            capFilter = "(cert > 0)";
         }
 
         // These are the rows that we will retrieve.
@@ -145,23 +144,11 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements
                         + "(valid_keys." + Keys.EXPIRY + " IS NULL OR valid_keys." + Keys.EXPIRY
                         + " >= '" + now + "')) AS " + SelectKeyCursorAdapter.PROJECTION_ROW_VALID, };
 
-        // if (searchString != null && searchString.trim().length() > 0) {
-        // String[] chunks = searchString.trim().split(" +");
-        // qb.appendWhere("EXISTS (SELECT tmp." + UserIds._ID + " FROM " + UserIds.TABLE_NAME
-        // + " AS tmp WHERE " + "tmp." + UserIds.KEY_ID + " = " + Keys.TABLE_NAME + "."
-        // + Keys._ID);
-        // for (int i = 0; i < chunks.length; ++i) {
-        // qb.appendWhere(" AND tmp." + UserIds.USER_ID + " LIKE ");
-        // qb.appendWhereEscapeString("%" + chunks[i] + "%");
-        // }
-        // qb.appendWhere(")");
-        // }
-
         String orderBy = UserIds.USER_ID + " ASC";
 
         // Now create and return a CursorLoader that will take care of
         // creating a Cursor for the data being displayed.
-        return new CursorLoader(getActivity(), baseUri, projection, CapFilter, null, orderBy);
+        return new CursorLoader(getActivity(), baseUri, projection, capFilter, null, orderBy);
     }
 
     @Override
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
index cb2ec9551..d9fb294d5 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
@@ -40,6 +40,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
@@ -49,14 +51,12 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Spinner;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
 /**
  * Signs the specified public key with the specified secret master key
  */
-public class SignKeyActivity extends SherlockFragmentActivity implements
+public class SignKeyActivity extends ActionBarActivity implements
         SelectSecretKeyLayoutFragment.SelectSecretKeyCallback {
     private BootstrapButton mSignButton;
     private CheckBox mUploadKeyCheckbox;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 87c06c97e..e3881503b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -30,19 +30,19 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
+import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
 /**
  * Sends the selected public key to a key server
  */
-public class UploadKeyActivity extends SherlockFragmentActivity {
+public class UploadKeyActivity extends ActionBarActivity {
     private BootstrapButton mUploadButton;
     private Spinner mKeyServerSpinner;
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 5fb4c90d6..5b8427ded 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -47,19 +47,19 @@ import android.os.Message;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
+import android.support.v7.app.ActionBarActivity;
 import android.text.format.DateFormat;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
-public class ViewKeyActivity extends SherlockFragmentActivity implements
+public class ViewKeyActivity extends ActionBarActivity implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
     ExportHelper mExportHelper;
@@ -115,7 +115,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.key_view, menu);
+        getMenuInflater().inflate(R.menu.key_view, menu);
         return true;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index 89b9acf61..f7e41daf7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -29,12 +29,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-public class DeleteFileDialogFragment extends SherlockDialogFragment {
+public class DeleteFileDialogFragment extends DialogFragment {
     private static final String ARG_DELETE_FILE = "delete_file";
 
     /**
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index f17899a19..109bfe929 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -33,11 +33,10 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-public class DeleteKeyDialogFragment extends SherlockDialogFragment {
+public class DeleteKeyDialogFragment extends DialogFragment {
     private static final String ARG_MESSENGER = "messenger";
     private static final String ARG_DELETE_KEY_RING_ROW_IDS = "delete_file";
     private static final String ARG_KEY_TYPE = "key_type";
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index a68f9bdbe..80ba8c725 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
@@ -32,15 +32,15 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
-public class FileDialogFragment extends SherlockDialogFragment {
+public class FileDialogFragment extends DialogFragment {
     private static final String ARG_MESSENGER = "messenger";
     private static final String ARG_TITLE = "title";
     private static final String ARG_MESSAGE = "message";
@@ -160,10 +160,6 @@ public class FileDialogFragment extends SherlockDialogFragment {
     /**
      * Updates filename in dialog, normally called in onActivityResult in activity using the
      * FileDialog
-     * 
-     * @param messageId
-     * @param progress
-     * @param max
      */
     private void setFilename(String filename) {
         AlertDialog dialog = (AlertDialog) getDialog();
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
index dbbc87a1a..76ec6df2c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
@@ -34,11 +34,9 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.v4.app.DialogFragment;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-
-public class LookupUnknownKeyDialogFragment extends SherlockDialogFragment {
+public class LookupUnknownKeyDialogFragment extends DialogFragment {
     private static final String ARG_MESSENGER = "messenger";
     private static final String ARG_UNKNOWN_KEY_ID = "unknown_key_id";
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index 898457324..e88271240 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
@@ -41,6 +41,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.v4.app.DialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -52,9 +53,7 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-public class PassphraseDialogFragment extends SherlockDialogFragment implements OnEditorActionListener {
+public class PassphraseDialogFragment extends DialogFragment implements OnEditorActionListener {
     private static final String ARG_MESSENGER = "messenger";
     private static final String ARG_SECRET_KEY_ID = "secret_key_id";
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index aa6cdfd68..9b5d233e8 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
@@ -23,17 +23,16 @@ import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnKeyListener;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
 import android.view.KeyEvent;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-public class ProgressDialogFragment extends SherlockDialogFragment {
+public class ProgressDialogFragment extends DialogFragment {
     private static final String ARG_MESSAGE_ID = "message_id";
     private static final String ARG_STYLE = "style";
 
     /**
      * Creates new instance of this fragment
-     * 
+     *
      * @param id
      * @return
      */
@@ -49,7 +48,7 @@ public class ProgressDialogFragment extends SherlockDialogFragment {
 
     /**
      * Updates progress of dialog
-     * 
+     *
      * @param messageId
      * @param progress
      * @param max
@@ -60,7 +59,7 @@ public class ProgressDialogFragment extends SherlockDialogFragment {
 
     /**
      * Updates progress of dialog
-     * 
+     *
      * @param messageId
      * @param progress
      * @param max
@@ -74,7 +73,7 @@ public class ProgressDialogFragment extends SherlockDialogFragment {
 
     /**
      * Updates progress of dialog
-     * 
+     *
      * @param messageId
      * @param progress
      * @param max
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
index aac066d61..50e72dfba 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
@@ -29,6 +29,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.v4.app.DialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,9 +41,7 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-public class SetPassphraseDialogFragment extends SherlockDialogFragment implements OnEditorActionListener {
+public class SetPassphraseDialogFragment extends DialogFragment implements OnEditorActionListener {
     private static final String ARG_MESSENGER = "messenger";
     private static final String ARG_TITLE = "title";
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
index bae398751..03e09cdcb 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
@@ -29,12 +29,11 @@ import android.nfc.NfcAdapter;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-public class ShareNfcDialogFragment extends SherlockDialogFragment {
+public class ShareNfcDialogFragment extends DialogFragment {
 
     /**
      * Creates new instance of this fragment
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
index 7594a9aed..653393749 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
@@ -31,15 +31,14 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockDialogFragment;
-
-public class ShareQrCodeDialogFragment extends SherlockDialogFragment {
+public class ShareQrCodeDialogFragment extends DialogFragment {
     private static final String ARG_KEY_URI = "uri";
     private static final String ARG_FINGERPRINT_ONLY = "fingerprint_only";
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 277f75c1a..9d3643914 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -16,11 +16,9 @@
 
 package org.sufficientlysecure.keychain.ui.widget;
 
-import java.util.Iterator;
 import java.util.Vector;
 
 import org.spongycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
@@ -39,6 +37,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
+import android.support.v7.app.ActionBarActivity;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -49,7 +48,6 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
 public class SectionView extends LinearLayout implements OnClickListener, EditorListener {
@@ -63,18 +61,18 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
     private int mNewKeySize;
     private boolean canEdit = true;
 
-    private SherlockFragmentActivity mActivity;
+    private ActionBarActivity mActivity;
 
     private ProgressDialogFragment mGeneratingDialog;
 
     public SectionView(Context context) {
         super(context);
-        mActivity = (SherlockFragmentActivity) context;
+        mActivity = (ActionBarActivity) context;
     }
 
     public SectionView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mActivity = (SherlockFragmentActivity) context;
+        mActivity = (ActionBarActivity) context;
     }
 
     public ViewGroup getEditors() {
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
index bcbb5f5c1..50134f4e7 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
@@ -17,9 +17,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:divider="@drawable/abs__list_divider_holo_light"
     android:dividerPadding="12dp"
     android:orientation="horizontal"
+    android:divider="@drawable/abc_list_divider_holo_light"
     android:showDividers="end" >
 
     <include layout="@layout/actionbar_include_done_button" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
index 8c8428e75..1d0476361 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
@@ -17,10 +17,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:divider="@drawable/abs__list_divider_holo_light"
     android:dividerPadding="12dp"
+    android:divider="@drawable/abc_list_divider_holo_light"
     android:orientation="horizontal"
-    android:showDividers="middle" >
+    android:showDividers="middle">
 
     <include layout="@layout/actionbar_include_cancel_button" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
index 0f0521d3c..5fd36286b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
@@ -16,14 +16,13 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/actionbar_cancel"
-    style="@style/Widget.Sherlock.ActionButton"
+    style="@style/Widget.AppCompat.ActionButton"
     android:layout_width="0dp"
     android:layout_height="match_parent"
-    android:layout_weight="1" >
+    android:layout_weight="1">
 
     <TextView
         android:id="@+id/actionbar_cancel_text"
-        style="@style/Widget.Sherlock.ActionBar.TabText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -31,6 +30,7 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:paddingRight="20dp"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
         android:text="Cancel (set in-code!)" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
index 54e5933e3..e51f63c80 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
@@ -16,14 +16,13 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/actionbar_done"
-    style="@style/Widget.Sherlock.ActionButton"
+    style="@style/Widget.AppCompat.ActionButton"
     android:layout_width="0dp"
     android:layout_height="match_parent"
-    android:layout_weight="1" >
+    android:layout_weight="1">
 
     <TextView
         android:id="@+id/actionbar_done_text"
-        style="@style/Widget.Sherlock.ActionBar.TabText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -31,6 +30,7 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:paddingRight="20dp"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
         android:text="Done (set in-code!)" />
 
 </FrameLayout>
\ No newline at end of file