aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0553-178/+276
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | Remove help button for nowDominik Schürmann2015-03-041-15/+3
| | |
| * | More icon naming fixes and designDominik Schürmann2015-03-047-36/+49
| | |
| * | Partially fix file namesDominik Schürmann2015-03-0412-13/+13
| | |
| * | Simplified language: Confirm keysDominik Schürmann2015-03-041-17/+20
| | |
| * | Crop image view to centerDominik Schürmann2015-03-041-4/+4
| | |
| * | Full height contact pic in key viewDominik Schürmann2015-03-041-1/+7
| | |
| * | Fix status bar orangeDominik Schürmann2015-03-041-1/+1
| | |
| * | Merge pull request #1097 from ishan1604/orange-toolbarDominik Schürmann2015-03-043-2/+33
| |\ \ | | | | | | | | Orange toolbar for certify and fingerprint activity added
| | * | Orange Toolbar Added Fixes #1088Ishan Khanna2015-03-043-2/+33
| | | |
| * | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵Dominik Schürmann2015-03-0323-39/+39
| |\ \ \ | | | | | | | | | | | | | | | into vectorijk-development
| | * | | change icon name in layout filesjiangkai2015-03-0323-39/+39
| | | |/ | | |/|
| * | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-031-17/+43
| | | |
| * | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-9/+18
| | |/ | |/|
| * | Fix toolbar margins on Android lower 5Dominik Schürmann2015-03-036-6/+6
| | |
| * | Use spinner DatePicker, not full calendar, also on Android 5Dominik Schürmann2015-03-032-37/+59
| |/
* | do a TON of UI workVincent Breitmoser2015-03-054-0/+212
| |
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+29
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-022-7/+19
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-022-7/+19
| |
* | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
| |
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0287-1517/+2232
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-281-2/+4
| |
| * Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| |
| * padding fixes for key listDominik Schürmann2015-02-281-2/+1
| |
| * Reorder advanced key viewDominik Schürmann2015-02-272-52/+0
| |
| * Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-271-41/+27
| |
| * Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-279-4/+46
| |
| * show refresh key progress inlineVincent Breitmoser2015-02-271-0/+9
| |
| * Keybase header textDominik Schürmann2015-02-273-105/+126
| |
| * Better qr code resizingDominik Schürmann2015-02-274-4/+8
| |
| * Prettify qr code cleanupDominik Schürmann2015-02-271-10/+0
| |
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-271-5/+27
| |
| * Uncluttering advanced key viewDominik Schürmann2015-02-272-133/+0
| |
| * Fix margins of dialog viewsDominik Schürmann2015-02-276-21/+30
| |
| * Merge keybase-proof branchDominik Schürmann2015-02-272-0/+124
| |\