aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary line in keybase fragmentDominik Schürmann2015-10-211-5/+0
|
* Fix keybase verificationDominik Schürmann2015-10-211-9/+0
|
* linked: fix colors for dark themeVincent Breitmoser2015-10-214-4/+3
|
* UI preparations for yubikey resetDominik Schürmann2015-10-162-128/+174
|
* nfc dialog: button placeholder to retain sizeDominik Schürmann2015-10-161-2/+24
|
* Prevent nfc dialog from closing when touching outside of it, add cancel buttonDominik Schürmann2015-10-162-1/+11
|
* Allow choosing of YubiKey PINDominik Schürmann2015-10-162-123/+30
|
* Layout for backup code inputDominik Schürmann2015-10-151-0/+152
|
* Cleanup, fix advanced sharingDominik Schürmann2015-10-151-17/+0
|
* Add restore to backup fragment, cleanup, renamingsDominik Schürmann2015-10-152-0/+22
|
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0810-21/+21
|\
| * center wizard buttons for other languagesDominik Schürmann2015-10-0410-21/+21
| |
* | decrypt: revise card layout marginsVincent Breitmoser2015-09-301-16/+18
| |
* | import: simplify ImportKeysActivity, don't display search bar for fixed inputVincent Breitmoser2015-09-301-9/+20
| |
* | enc-export: localization, and layout compatibilityVincent Breitmoser2015-09-291-329/+0
| |
* | enc-export: rename fragment to match classVincent Breitmoser2015-09-291-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-282-141/+109
|\|
| * Confirm designDominik Schürmann2015-09-241-131/+83
| |
| * Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵Dominik Schürmann2015-09-201-10/+26
| | | | | | | | add (OKC-01-018)
* | enc-backup: didn't like the check mark icon after allVincent Breitmoser2015-09-251-2/+0
| |
* | enc-backup: use black check icon for button, and some cleanupVincent Breitmoser2015-09-251-1/+1
| |
* | enc-backup: use only one fragment after allVincent Breitmoser2015-09-252-126/+217
| |
* | enc-backup: handle bad code more nicelyVincent Breitmoser2015-09-251-2/+1
| |
* | enc-backup: ask for backup code againVincent Breitmoser2015-09-253-16/+213
| |
* | encrypted export WIPVincent Breitmoser2015-09-193-0/+70
|/
* Use material overflow icon in decrypt listDominik Schürmann2015-09-171-3/+4
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-161-1/+3
|
* multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-162-10/+12
|
* multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-162-62/+66
|
* multidecrypt: prepare viewholder for file listVincent Breitmoser2015-09-161-51/+58
|
* linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-102-290/+0
|
* linked: localization for github creationVincent Breitmoser2015-09-101-6/+6
|
* linked: add "retry"Vincent Breitmoser2015-09-081-2/+13
|
* linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-065-8/+8
|\
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-035-8/+8
| | | | | | | | Move launcher icons to mipmap
* | linked: basic shared element transitionVincent Breitmoser2015-09-064-272/+3
| |
* | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-023-13/+22
|/
* linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
|
* linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
|
* linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-011-31/+31
|
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-011-1/+1
|
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-011-7/+27
|
* linked: work on github designVincent Breitmoser2015-09-011-45/+46
|
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-012-2/+173
|
* add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+30
|
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-311-1/+3
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2916-8/+1779
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-117-111/+205
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
| | |