From 3c0b97f280f11d553d93df9bc93ce47098af35d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 30 Mar 2014 19:26:41 +0200
Subject: Remove cancel from app menu

---
 .../keychain/remote/ui/AccountSettingsActivity.java                   | 3 ---
 OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml           | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
index 671a3e0aa..d1c049e2a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
@@ -82,9 +82,6 @@ public class AccountSettingsActivity extends ActionBarActivity {
             case R.id.menu_account_settings_delete:
                 deleteAccount();
                 return true;
-            case R.id.menu_account_settings_cancel:
-                finish();
-                return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml
index d08fc7f42..713345ffc 100644
--- a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml
@@ -6,9 +6,5 @@
         android:id="@+id/menu_account_settings_delete"
         android:title="@string/api_settings_delete_account"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/menu_account_settings_cancel"
-        android:title="@string/api_settings_cancel"
-        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3