diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml | |
parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml')
-rw-r--r-- | OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml new file mode 100644 index 000000000..d6ed726fa --- /dev/null +++ b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/encrypt_save" + android:title="@string/btn_encrypt_save_file" + android:icon="@drawable/ic_action_encrypt_save_24dp" + app:showAsAction="always" /> + + <item + android:id="@+id/encrypt_share" + android:title="@string/btn_encrypt_share_file" + android:icon="@drawable/ic_action_encrypt_share_24dp" + app:showAsAction="always" /> + + <item + android:id="@+id/check_use_symmetric" + android:title="@string/label_symmetric" + 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_enable_compression" + android:title="@string/label_enable_compression" + android:checked="true" + android:checkable="true" /> + + <item + android:id="@+id/check_encrypt_filenames" + android:title="@string/label_encrypt_filenames" + android:checked="true" + 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_hidden_recipients"--> + <!--android:title="@string/label_hidden_recipients"--> + <!--android:checked="false"--> + <!--android:checkable="true" />--> + +</menu>
\ No newline at end of file |