Dominik Schürmann
|
8ce837dbe4
|
Rework menu items
|
2014-04-05 23:07:49 +02:00 |
|
Vincent Breitmoser
|
d7c2488a0f
|
db-overhaul: fix key export (and some export-related ui changes)
|
2014-04-04 18:49:45 +02:00 |
|
Dominik Schürmann
|
d8001f9bbd
|
Menu cleanup
|
2014-04-01 19:31:57 +02:00 |
|
Dominik Schürmann
|
4c5ae3cdaa
|
Readd create key menu items
|
2014-03-13 19:01:24 +01:00 |
|
Vincent Breitmoser
|
69f5bf6b57
|
Merge branch 'unified-keylist'
Conflicts:
OpenPGP-Keychain/src/main/AndroidManifest.xml
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
OpenPGP-Keychain/src/main/res/menu/key_list.xml
OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
|
2014-03-12 18:05:28 +01:00 |
|
Vincent Breitmoser
|
4851f7f8fc
|
copy public keylist as stub for unified keylist
|
2014-03-06 01:32:18 +01:00 |
|