moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-25 16:01:52 -05:00
Code Issues Releases Wiki Activity

Revert "Remove cancel from app menu"

Browse Source 
This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4.
This commit is contained in:
Dominik Schürmann 2014-03-30 19:28:35 +02:00
parent 3c0b97f280
commit 583467356c
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
View File

@ -82,6 +82,9 @@ public class AccountSettingsActivity extends ActionBarActivity {
case R.id.menu_account_settings_delete: case R.id.menu_account_settings_delete:
deleteAccount(); deleteAccount();
return true; return true;
case R.id.menu_account_settings_cancel:
finish();
return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }

4
OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml
View File

@ -6,5 +6,9 @@
android:id="@+id/menu_account_settings_delete" android:id="@+id/menu_account_settings_delete"
android:title="@string/api_settings_delete_account" android:title="@string/api_settings_delete_account"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:id="@+id/menu_account_settings_cancel"
android:title="@string/api_settings_cancel"
app:showAsAction="never" />
</menu> </menu>