aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/view_key_fragment.xml
Commit message (Collapse)AuthorAgeFilesLines
* Improve linked identity handlingDominik Schürmann2015-12-311-0/+30
|
* Add edit action to user id card, left align card actions per material design ↵Dominik Schürmann2015-12-291-22/+50
| | | | guidelines
* linked: fix colors for dark themeVincent Breitmoser2015-10-211-1/+1
|
* linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-011-31/+31
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+60
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
| |
| * small changes for performanceVincent Breitmoser2015-04-271-3/+4
| |
| * use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-4/+7
| |
| * Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-6/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * | | add expand item to linked id listVincent Breitmoser2015-03-101-1/+21
| | | |
| * | | do a TON of UI workVincent Breitmoser2015-03-051-0/+1
| | | |
| * | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+29
| | | |
* | | | Make keybase an experimental featureDominik Schürmann2015-08-281-3/+1
| | | |
* | | | Improve scrolling in key viewDominik Schürmann2015-08-281-1/+3
| | | |
* | | | Collapsing ToolbarDominik Schürmann2015-08-281-72/+66
| | | |
* | | | Make CardView background themeableThialfihar2015-07-211-2/+2
| |_|/ |/| | | | | | | | However, CardViews displaying QR codes keep a fixed white background.
* | | hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-0/+1
| |/ |/|
* | RippleDominik Schürmann2015-03-101-0/+2
| |
* | changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| |
* | added contact linkingAdithya Abraham Philip2015-03-101-3/+20
| |
* | added cardAdithya Abraham Philip2015-03-101-5/+33
| |
* | Remove help button for nowDominik Schürmann2015-03-041-15/+3
| |
* | More icon naming fixes and designDominik Schürmann2015-03-041-3/+15
|/
* Better qr code resizingDominik Schürmann2015-02-271-1/+1
|
* CardView and more header designDominik Schürmann2015-02-251-3/+6
|
* Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-251-342/+26
|
* Bigger status icon in key viewDominik Schürmann2015-02-251-1/+1
|
* Remove tabs in view keyDominik Schürmann2015-02-241-0/+360