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/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
This commit is contained in:
Vincent Breitmoser
2015-03-05 12:10:51 +01:00
parent 98ce06dbc9 8c8fdd6c49
commit 7b3bc4ca98
598 changed files with 1240 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/menu/key_view.xml
View File

@@ -22,7 +22,7 @@
<item
android:id="@+id/menu_key_view_delete"
android:icon="@drawable/ic_action_discard"
android:icon="@drawable/ic_delete_grey_24dp"
app:showAsAction="never"
android:title="@string/menu_delete_key" />

11
OpenKeychain/src/main/res/menu/log_display.xml Normal file
View File

@@ -0,0 +1,11 @@
<?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/menu_log_display_export_log"
android:icon="@drawable/ic_save_white_24dp"
android:title="@string/menu_export_log"
app:showAsAction="ifRoom|withText" />
</menu>