aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-2/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * | | | revamp decrypt uiVincent Breitmoser2015-04-241-49/+0
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | working DisplayTextActivity, more input support in DecryptActivityVincent Breitmoser2015-06-201-4/+6
| | | | |
* | | | | nicer preview of decrypt_text_fragment layoutVincent Breitmoser2015-06-171-0/+3
| |_|_|/ |/| | |
* | | | Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-041-3/+3
| |_|/ |/| |
* | | Remove unused decrypt result layoutDominik Schürmann2015-04-261-2/+0
| |/ |/|
* | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-261-1/+1
| |
* | revamp decrypt uiVincent Breitmoser2015-04-241-49/+0
|/
* RippleDominik Schürmann2015-03-101-2/+2
|
* change icon name in layout filesjiangkai2015-03-031-2/+2
|
* More consisitencyDominik Schürmann2014-10-151-1/+1
|
* More color/icon consistencyDominik Schürmann2014-10-151-2/+2
|
* Big error screen if signature is invalid or key is revoked/expired, also ↵Dominik Schürmann2014-10-081-55/+91
| | | | fixes signature status for expired and revoked keys
* Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling ↵Dominik Schürmann2014-10-011-73/+62
| | | | in decryt screen
* Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-231-3/+3
|
* Small UI fixesDominik Schürmann2014-09-211-2/+1
|
* New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-151-0/+90
non-decodable characters)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 16:56:59 +0000