diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-30 19:28:35 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-30 19:28:35 +0200 |
| commit | 583467356c5abea80be673264b3f600c578a862d (patch) | |
| tree | a9f9833a1a5ecb8b68bc55a42282a747cd9f7eee /OpenPGP-Keychain/src | |
| parent | 3c0b97f280f11d553d93df9bc93ce47098af35d4 (diff) | |
| download | open-keychain-583467356c5abea80be673264b3f600c578a862d.tar.gz open-keychain-583467356c5abea80be673264b3f600c578a862d.tar.bz2 open-keychain-583467356c5abea80be673264b3f600c578a862d.zip | |
Revert "Remove cancel from app menu"
This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4.
Diffstat (limited to 'OpenPGP-Keychain/src')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java | 3 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml | 4 |
2 files changed, 7 insertions, 0 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 d1c049e2a..671a3e0aa 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,6 +82,9 @@ 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 713345ffc..d08fc7f42 100644 --- a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml +++ b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml @@ -6,5 +6,9 @@ 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 |