Vincent Breitmoser
|
db25c56b64
|
certify: add certify action button to viewkeymainfragment
|
2014-03-15 18:20:42 +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 |
|
Dominik Schürmann
|
5b255a263f
|
Fix key id and fingerprint handling, use full key ids
|
2014-03-09 01:49:25 +01:00 |
|
Vincent Breitmoser
|
16116ba725
|
ditch old key list activities
|
2014-03-08 13:42:50 +01:00 |
|
Vincent Breitmoser
|
706e212b6b
|
add edit button and secret key info to public key view
|
2014-03-08 13:17:52 +01:00 |
|
Dominik Schürmann
|
439c7a66f2
|
fix margins
|
2014-02-17 20:18:17 +01:00 |
|
Dominik Schürmann
|
7a04dfe6bf
|
prevent key view from scrolling, move encrypt button down again
|
2014-02-17 20:16:58 +01:00 |
|
Dominik Schürmann
|
0c4b809195
|
rework key view into fragments to later add certifications
|
2014-02-09 21:17:30 +01:00 |
|