11 Commits

Author SHA1 Message Date
Vincent Breitmoser
2227705d65 db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity 2014-04-04 11:28:26 +02:00
Dominik Schürmann
ef562b5e20 Fix layouts 2014-04-01 15:04:54 +02:00
Thialfihar
f5ecd2ae46 Move fingerprint up below the algorithm in key view
This makes it consistent with the key list entry layout and it also
makes more sense, as it belongs to key identification.
2014-03-20 18:40:30 +01:00
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