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

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-03-08 01:49:22 +01:00
parent 581cad5b3f 4f11fb5a2f
commit 2b5023a75d
54 changed files with 1322 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,4 +12,9 @@
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" />
</menu>

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

@@ -4,4 +4,9 @@
android:id="@+id/check_use_symmetric"
android:title="@string/label_symmetric"
android:checkable="true" />
<item
android:id="@+id/check_enable_compression"
android:title="@string/label_enable_compression"
android:checked="true"
android:checkable="true" />
</menu>