aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-44/+80
|\
| * Merge pull request #1108 from tdjogi010/developmentVincent2015-03-061-38/+74
| |\
| | * Asks Passphrase for key delete/export in ViewKeyActivity.tdjogi010@gmail.com2015-03-061-38/+74
* | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-163/+162
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-33/+28
|\| |
| * | Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-041-4/+5
| |\ \
| | * | #1042 replaced some int constants with enumsDaniel Nelz2015-03-041-4/+5
| | |/
| * | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| * | Get high res version of contact photoDominik Schürmann2015-03-041-1/+1
| * | Crop image view to centerDominik Schürmann2015-03-041-3/+2
| * | Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
| * | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-041-11/+9
| |/
| * Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
| * rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
* | do a TON of UI workVincent Breitmoser2015-03-051-1/+1
* | add linked it to view key context menuVincent Breitmoser2015-03-021-0/+11
|/
* don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
* fix a couple lint errorsVincent Breitmoser2015-02-281-3/+4
* some changes to qr scan logicVincent Breitmoser2015-02-281-6/+46
* pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-281-1/+21
* slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
* transition status color in key viewVincent Breitmoser2015-02-271-3/+30
* show refresh key progress inlineVincent Breitmoser2015-02-271-7/+125
* go to directly to certify screen after nfc importVincent Breitmoser2015-02-271-2/+2
* Simplify delete key dialogDominik Schürmann2015-02-271-2/+0
* Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-36/+24
* Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-251-16/+41
* Invoke NFC buttonDominik Schürmann2015-02-251-0/+28
* Other icon for key exchangeDominik Schürmann2015-02-251-1/+1
* Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-251-5/+42
* CardView and more header designDominik Schürmann2015-02-251-12/+21
* Fix menuDominik Schürmann2015-02-251-0/+2
* Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-251-33/+221
* Bigger status icon in key viewDominik Schürmann2015-02-251-4/+6
* First work on new key view toolbarDominik Schürmann2015-02-251-40/+111
* Remove tabs in view keyDominik Schürmann2015-02-241-33/+17
* New advanced key viewDominik Schürmann2015-02-231-5/+5
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-291-1/+1
* Style tabs, add missing drawablesDominik Schürmann2015-01-151-24/+9
* Refactor BaseActivityDominik Schürmann2015-01-131-2/+2
* Use Toolbar and new BaseActivityDominik Schürmann2015-01-131-4/+7
* Move advanced info into own activityDominik Schürmann2014-10-261-74/+4
* color experimentsDominik Schürmann2014-10-151-10/+2
* move around package structure a bitVincent Breitmoser2014-10-101-1/+1
* Add null check when retrieving key ids from contacts apiDominik Schürmann2014-10-021-0/+7
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-2/+1
* package reordering: merge util and helper, there were no real difference; cre...Dominik Schürmann2014-09-171-6/+6
* work on OperationResultParcelVincent Breitmoser2014-09-141-3/+3
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-1/+1
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-1/+1