cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'development' into linked-identities

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-10 00:57:23 +01:00
parent f76f84dfb2 e3547b4979
commit 4db86fdabe
179 changed files with 1531 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
View File

@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<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"

16
OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
View File

@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/encrypt_copy"
android:title="@string/btn_copy_encrypted_signed"
android:icon="@drawable/ic_action_encrypt_copy_24dp"
app:showAsAction="always" />
<item
android:id="@+id/encrypt_share"
android:title="@string/btn_share_encrypted_signed"
android:icon="@drawable/ic_action_encrypt_share_24dp"
app:showAsAction="always" />
<item
android:id="@+id/check_use_symmetric"
android:title="@string/label_symmetric"