aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* work on second step of identity creationVincent Breitmoser2015-03-134-190/+146
|
* use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-137-65/+84
|
* change finish button label to "link identity"Vincent Breitmoser2015-03-133-3/+3
|
* fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
|
* twitter layout step3 -> step2Vincent Breitmoser2015-03-122-221/+77
|
* finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+1
|
* better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-21/+27
|
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1033-59/+193
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * RippleDominik Schürmann2015-03-1022-37/+39
| |
| * Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-101-5/+50
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+7
| | |
| | * changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| | |
| | * Make create key wizard step-by-stepDominik Schürmann2015-03-104-99/+201
| | |
| | * added contact linkingAdithya Abraham Philip2015-03-101-3/+20
| | |
| | * added cardAdithya Abraham Philip2015-03-101-5/+33
| | |
| * | Add additional email addresses in create keyDominik Schürmann2015-03-104-0/+84
| | |
* | | add expand item to linked id listVincent Breitmoser2015-03-101-1/+21
| | |
* | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
| | |
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1025-446/+446
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+7
| | |
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-094-99/+201
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-091-17/+17
| |
| * Fix colors for remote activityDominik Schürmann2015-03-092-13/+6
| |
| * Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-092-2/+2
| |\ | | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| | * Implemented NameEditTextchipset952015-03-092-2/+2
| | |
| * | Redesign of encrypt activites finishedDominik Schürmann2015-03-094-115/+17
| | |
| * | Fix padding in create keyDominik Schürmann2015-03-091-0/+2
| | |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-092-26/+9
| |\| | | | | | | | | | development
| | * minor xml code style correctionAdithya Abraham Philip2015-03-081-8/+8
| | |
| | * cleaned up codeAdithya Abraham Philip2015-03-061-0/+1
| | |
| | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-5/+1
| | |
| | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-061-1/+1
| | |
| | * added PassphraseEditTextAdithya Abraham Philip2015-03-061-17/+3
| | |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-063-17/+33
| |\| | | | | | | | | | development
| * | Tryout design for encrypt, decryptDominik Schürmann2015-03-065-3/+42
| | |
| * | Fix elevationDominik Schürmann2015-03-066-104/+76
| | |
* | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-092-11/+102
| | |
* | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-52/+0
| | |
* | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-0/+8
| | |
* | | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| | |
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-084-21/+55
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-063-17/+33
| |/
| * Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-051-8/+26
| |\ | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| | * Integrates passphrase strength indicator to create key wizard.Lukas Zorich2015-03-031-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | This commit patches issue #1050. The padding set in the passphrase edit text is set programmatically because there is a bug in appcompat-v7 where padding via xml doesn't work: http://code.google.com/p/android/issues/detail?id=77982
| | * Add license to password strength view classesLukas Zorich2015-03-031-1/+12
| | |
| * | Design fixes for decryption screenDominik Schürmann2015-03-051-1/+1
| | |
* | | work on certification stepVincent Breitmoser2015-03-081-1/+10
| | |
* | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-062-6/+86
| | |
* | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-053-80/+8
| | |
* | | make linked identity list homogeneousVincent Breitmoser2015-03-052-6/+6
| | |