aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Expand)AuthorAgeFilesLines
* make linked identity list homogeneousVincent Breitmoser2015-03-052-6/+6
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0553-178/+276
|\
| * Remove help button for nowDominik Schürmann2015-03-041-15/+3
| * More icon naming fixes and designDominik Schürmann2015-03-047-36/+49
| * Partially fix file namesDominik Schürmann2015-03-0412-13/+13
| * Simplified language: Confirm keysDominik Schürmann2015-03-041-17/+20
| * Crop image view to centerDominik Schürmann2015-03-041-4/+4
| * Full height contact pic in key viewDominik Schürmann2015-03-041-1/+7
| * Fix status bar orangeDominik Schürmann2015-03-041-1/+1
| * Merge pull request #1097 from ishan1604/orange-toolbarDominik Schürmann2015-03-043-2/+33
| |\
| | * Orange Toolbar Added Fixes #1088Ishan Khanna2015-03-043-2/+33
| * | Merge branch 'development' of https://github.com/vectorijk/open-keychain into...Dominik Schürmann2015-03-0323-39/+39
| |\ \
| | * | change icon name in layout filesjiangkai2015-03-0323-39/+39
| * | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-031-17/+43
| * | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-9/+18
| | |/ | |/|
| * | Fix toolbar margins on Android lower 5Dominik Schürmann2015-03-036-6/+6
| * | Use spinner DatePicker, not full calendar, also on Android 5Dominik Schürmann2015-03-032-37/+59
| |/
* | do a TON of UI workVincent Breitmoser2015-03-054-0/+212
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+29
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-022-7/+19
|\|
| * make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-022-7/+19
* | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0287-1517/+2232
|\|
| * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-281-2/+4
| * Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| * padding fixes for key listDominik Schürmann2015-02-281-2/+1
| * Reorder advanced key viewDominik Schürmann2015-02-272-52/+0
| * Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-271-41/+27
| * Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-279-4/+46
| * show refresh key progress inlineVincent Breitmoser2015-02-271-0/+9
| * Keybase header textDominik Schürmann2015-02-273-105/+126
| * Better qr code resizingDominik Schürmann2015-02-274-4/+8
| * Prettify qr code cleanupDominik Schürmann2015-02-271-10/+0
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-271-5/+27
| * Uncluttering advanced key viewDominik Schürmann2015-02-272-133/+0
| * Fix margins of dialog viewsDominik Schürmann2015-02-276-21/+30
| * Merge keybase-proof branchDominik Schürmann2015-02-272-0/+124
| |\
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-052-2/+0
| | |\
| | * \ Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-15/+9
| | |\ \
| | * | | XML fragment for proof listingTim Bray2014-11-071-0/+19
| | * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+105
| * | | | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-267-28/+203
| * | | | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-251-8/+0
| * | | | Invoke NFC buttonDominik Schürmann2015-02-252-2/+10
| * | | | Other icon for key exchangeDominik Schürmann2015-02-253-3/+3
| * | | | Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-252-13/+23
| * | | | CardView and more header designDominik Schürmann2015-02-252-21/+31
| * | | | Use material icon for safeslingerDominik Schürmann2015-02-253-3/+3
| * | | | Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-252-375/+75
| * | | | Bigger status icon in key viewDominik Schürmann2015-02-2510-26/+34