aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Simplified language: Confirm keysDominik Schürmann2015-03-042-17/+8
* Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
* Crop image view to centerDominik Schürmann2015-03-041-3/+2
* Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
* ContactHelper cleanupDominik Schürmann2015-03-042-34/+41
* Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-049-119/+129
* Simplify dialogs according to Material DesignDominik Schürmann2015-03-042-13/+9
* Merge pull request #1080 from indrora/avoid-large-log-parcelsVincent2015-03-041-6/+63
|\
| * Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| * Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
* | Merge branch 'development' of https://github.com/vectorijk/open-keychain into...Dominik Schürmann2015-03-032-2/+2
|\ \
| * | icon name changes in UI filesjiangkai2015-03-032-2/+2
* | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
* | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-033-44/+47
* | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-24/+25
|/ /
* | Remove old min sdk checkDominik Schürmann2015-03-031-3/+1
* | Merge pull request #1082 from ishan1604/bug-1081Dominik Schürmann2015-03-031-3/+0
|\ \ | |/ |/|
| * Fixes Issue #1081Ishan Khanna2015-03-031-3/+0
* | Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
* | Cleanup of contact sync, debuggingDominik Schürmann2015-03-032-94/+126
|/
* rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
* forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
* some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-03-021-7/+20
|\
| * Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
* | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
* | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-024-115/+143
* | fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
|/
* some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
* pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-284-49/+87
* fab support for all notify typesVincent Breitmoser2015-02-281-23/+29
* small Notify cleanupVincent Breitmoser2015-02-281-24/+2
* clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10
* collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
* animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
* forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-283-4/+85
|\
| * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-283-5/+85
* | Update from transifexDominik Schürmann2015-02-281-2/+0
|/
* Simplify MainActivityDominik Schürmann2015-02-282-52/+23
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-272-5/+32
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-02-274-172/+9
| |\
| * | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| * | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| * | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
* | | Reorder advanced key viewDominik Schürmann2015-02-272-59/+7
| |/ |/|
* | Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+5
* | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-272-167/+0
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-272-8/+131
|\|
| * show refresh key progress inlineVincent Breitmoser2015-02-272-8/+131