aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-269-19/+220
|\ | | | | | | | | | | | | 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
| * Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-263-2/+147
| |
| * Switch to new support lib version 22.1Dominik Schürmann2015-04-251-1/+1
| |
| * Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-252-0/+28
| |\ | | | | | | Switch to MaterialDrawer library
| | * Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-241-2/+4
| | |
| | * Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-242-0/+26
| | |
| * | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| | |
| * | revamp decrypt uiVincent Breitmoser2015-04-242-74/+19
| |/
| * Fixed Snackbar behind layoutManoj Khanna2015-04-222-16/+15
| | | | | | | | Surrounded string with quotes
| * keyserver verification on additionAdithya Abraham Philip2015-04-221-0/+29
| |
* | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-253-10/+5
| |
* | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-4/+10
| |
* | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| |
* | revamp decrypt uiVincent Breitmoser2015-04-242-74/+19
| |
* | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-4/+7
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2412-99/+406
|\| | | | | | | | | | | | | | | | | | | | | 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 pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-0/+1
| |\ | | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-0/+1
| | |
| * | Simplify passphrase dialog designDominik Schürmann2015-03-311-1/+0
| | |
| * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | |
| * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-303-63/+59
| | |
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-303-13/+23
| |\| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| | * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
| * | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-2/+1
| | |
| * | Refactoring of EncryptTextActivityDominik Schürmann2015-03-271-4/+3
| | |
| * | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-263-10/+8
| | |
| * | finish ui flow for yubikey importVincent Breitmoser2015-03-221-17/+58
| | |
| * | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-3/+8
| | |
| * | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-222-70/+115
| | |
| * | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-212-19/+88
| | |
| * | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-16/+85
| | |
| * | first steps toward yubikey activityVincent Breitmoser2015-03-212-17/+100
| |/ | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* | minor ui and wording changesVincent Breitmoser2015-04-091-4/+16
| |
* | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| |
* | even more linked id ui workVincent Breitmoser2015-03-292-6/+8
| |
* | more (subtle) ui workVincent Breitmoser2015-03-261-22/+19
| |
* | some linked id ui fine tuningVincent Breitmoser2015-03-269-125/+70
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-246-147/+165
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-5/+15
| |
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-201-4/+21
| | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
| * Manage my keys wizardDominik Schürmann2015-03-193-138/+107
| |
| * Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-0/+22
| |
* | support github resource (re)Vincent Breitmoser2015-03-243-0/+321
| |
* | work on certification uiVincent Breitmoser2015-03-152-27/+39
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-78/+73
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Remove display of key id in other listsDominik Schürmann2015-03-151-1/+1
| |
| * Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-151-2/+2
| | | | | | | | duplicate
| * API 7Dominik Schürmann2015-03-102-75/+70
| |
* | work on second step of identity creationVincent Breitmoser2015-03-134-190/+146
| |
* | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-137-65/+84
| |