diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-06 18:06:48 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-06 18:06:48 +0200 |
| commit | 0d1c9f774576f0a471cd2e69447cff1b8a3bc01f (patch) | |
| tree | 48ef1da8619d89030c6a667b9823b8ba8f324331 | |
| parent | 05a29a1f8f20884dbd34fc8981aaba6d61ceb4cc (diff) | |
| download | open-keychain-0d1c9f774576f0a471cd2e69447cff1b8a3bc01f.tar.gz open-keychain-0d1c9f774576f0a471cd2e69447cff1b8a3bc01f.tar.bz2 open-keychain-0d1c9f774576f0a471cd2e69447cff1b8a3bc01f.zip | |
Remove file menu items from text activity
3 files changed, 20 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index f008e26d5..a59c4de68 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -354,7 +354,7 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.encrypt_file_activity, menu); + getMenuInflater().inflate(R.menu.encrypt_text_activity, menu); return super.onCreateOptionsMenu(menu); } diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml index 05d85ee2a..fd0a85d6c 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> - <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true"/> - <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" android:checkable="true" /> - <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" /> + <item + android:id="@+id/check_use_symmetric" + android:title="@string/label_symmetric" + android:checkable="true" /> + <item + android:id="@+id/check_use_armor" + android:title="@string/label_file_ascii_armor" + android:checkable="true" /> + <item + android:id="@+id/check_delete_after_encrypt" + android:title="@string/label_delete_after_encryption" + android:checkable="true" /> </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml new file mode 100644 index 000000000..8deb59514 --- /dev/null +++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/check_use_symmetric" + android:title="@string/label_symmetric" + android:checkable="true" /> +</menu>
\ No newline at end of file |