aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
Commit message (Collapse)AuthorAgeFilesLines
* work on second step of identity creationVincent Breitmoser2015-03-131-60/+24
|
* use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-12/+20
|
* change finish button label to "link identity"Vincent Breitmoser2015-03-131-1/+1
|
* fix linked wizard buttonsVincent Breitmoser2015-03-121-5/+8
|
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-2/+2
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-2/+2
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
* some fixes for compiling (still not working!)Vincent Breitmoser2015-03-021-1/+1
|
* affirmation -> linked identityVincent Breitmoser2015-01-151-0/+190