aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-02 14:13:09 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-02 14:13:09 +0100
commit6eaf45940e415ba66ed28b339d63bac9d8623718 (patch)
treed21a37f42ffca30502843cf19acd0c9469304d54 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
parentf916c8f5af5fd46037dd7d4be28155dac67b1634 (diff)
downloadopen-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/DecryptActivity.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java5
1 files changed, 2 insertions, 3 deletions
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);