aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-0332-80/+99
* Floating Action Button added in app settingsDominik Schürmann2015-02-0336-41/+132
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-021-23/+38
|\
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-23/+37
| * Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-3125-362/+182
| |\
| * | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
* | | UI experiments for app settingsDominik Schürmann2015-02-023-39/+41
| |/ |/|
* | Rename app setting classes for consistencyDominik Schürmann2015-01-302-2/+2
* | Saving of allowed keysDominik Schürmann2015-01-292-0/+13
* | Header image tryoutDominik Schürmann2015-01-293-3/+2
* | Remove files related to old nav drawerDominik Schürmann2015-01-2916-227/+52
* | Fix item layout in apps listDominik Schürmann2015-01-291-10/+10
* | Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-294-119/+98
* | White popup themeDominik Schürmann2015-01-291-3/+7
|/
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-299-57/+0
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
|\
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
* | Cloud search iconDominik Schürmann2015-01-285-2/+1
* | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
|\ \
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-271-0/+2
| |\ \
| | * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+1
| | * | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-0/+1
* | | | Temporary nav drawer fixesDominik Schürmann2015-01-274-2/+27
|/ / /
* / / Material Design DrawerDominik Schürmann2015-01-2627-0/+5
|/ /
* | Material Design: Full screen dialogsDominik Schürmann2015-01-2644-91/+66
* | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+7
* | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
|/
* Style tabs, add missing drawablesDominik Schürmann2015-01-1515-6/+13
* Fix drawable sizesDominik Schürmann2015-01-1419-0/+0
* Toolbar for settingsDominik Schürmann2015-01-148-3/+13
* Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-0/+1
* Reorganize folders of graphics sourcesDominik Schürmann2015-01-1437-1/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-141-0/+1
|\
| * small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
* | Fix SearchViewDominik Schürmann2015-01-144-19/+44
|/
* Better way to have dark toolbar and light themeDominik Schürmann2015-01-142-33/+3
* Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-141-8/+18
* Launcher icon fixesDominik Schürmann2015-01-149-12/+0
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-141-1/+36
|\
| * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+17
| * support addition of user attributesVincent Breitmoser2015-01-131-0/+3
| * add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-1/+16
* | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1327-828/+1099
* | GreenDominik Schürmann2015-01-13227-45/+164
* | Start working on Material DesignDominik Schürmann2015-01-1310-125/+154
|/
* Test new iconDominik Schürmann2015-01-076-0/+0
* OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
* PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
* OpenPGP not PGPDominik Schürmann2015-01-072-2/+2
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-069-56/+74
|\