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

Merge branch 'master' into improve-file-more

Browse Source 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
This commit is contained in:
mar-v-in
2014-07-31 23:19:01 +02:00
parent 0c7eea225b 50aea621ba
commit eae7c711a3
439 changed files with 8241 additions and 3217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -26,11 +26,6 @@
app:showAsAction="never"
android:title="@string/menu_create_key" />
<item
android:id="@+id/menu_key_list_create_expert"
app:showAsAction="never"
android:title="@string/menu_create_key_expert" />
<item
android:id="@+id/menu_key_list_debug_read"
app:showAsAction="never"
@@ -43,4 +38,10 @@
android:title="Debug / DB backup"
android:visible="false" />
<item
android:id="@+id/menu_key_list_debug_first_time"
app:showAsAction="never"
android:title="Debug / Show first time screen"
android:visible="false" />
</menu>