aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-30 19:26:41 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-30 19:26:41 +0200
commit3c0b97f280f11d553d93df9bc93ce47098af35d4 (patch)
treea58a14ef7098159a400f743d550c12224dcb6505
parent7b53150ad55f732c6bf01e0d0fd2bea624068182 (diff)
downloadopen-keychain-3c0b97f280f11d553d93df9bc93ce47098af35d4.tar.gz
open-keychain-3c0b97f280f11d553d93df9bc93ce47098af35d4.tar.bz2
open-keychain-3c0b97f280f11d553d93df9bc93ce47098af35d4.zip
Remove cancel from app menu
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java3
-rw-r--r--OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml4
2 files changed, 0 insertions, 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