aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix animations in create keyDominik Schürmann2014-07-311-14/+16
|
* Fix conflictsDominik Schürmann2014-07-301-1/+2
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-0/+1
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
| * fix a couple remaining AppMsgsVincent Breitmoser2014-07-291-6/+3
| |
* | Create key with fragmentsDominik Schürmann2014-07-301-210/+42
|/
* Work on first time wizard designDominik Schürmann2014-07-271-7/+67
|
* Program flow fixesDominik Schürmann2014-07-251-22/+24
|
* Simple create keyDominik Schürmann2014-07-161-1/+0
|
* Simple create keyDominik Schürmann2014-07-161-3/+57
|
* New first time screenDominik Schürmann2014-07-161-0/+134