aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/view_key_fragment.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-6/+56
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * RippleDominik Schürmann2015-03-101-0/+2
| |
| * changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| |
| * added contact linkingAdithya Abraham Philip2015-03-101-3/+20
| |
| * added cardAdithya Abraham Philip2015-03-101-5/+33
| |
| * Remove help button for nowDominik Schürmann2015-03-041-15/+3
| |
| * More icon naming fixes and designDominik Schürmann2015-03-041-3/+15
| |
* | add expand item to linked id listVincent Breitmoser2015-03-101-1/+21
| |
* | do a TON of UI workVincent Breitmoser2015-03-051-0/+1
| |
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+29
|/
* Better qr code resizingDominik Schürmann2015-02-271-1/+1
|
* CardView and more header designDominik Schürmann2015-02-251-3/+6
|
* Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-251-342/+26
|
* Bigger status icon in key viewDominik Schürmann2015-02-251-1/+1
|
* Remove tabs in view keyDominik Schürmann2015-02-241-0/+360