aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Material Design DrawerDominik Schürmann2015-01-265-21/+72
* Material Design: Full screen dialogsDominik Schürmann2015-01-2610-155/+118
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-2549-234/+177
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-1/+1
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-242-6/+13
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-192-1/+9
|\
| * No setContentView in onCreate for KeyListActivityVincent2015-01-161-2/+0
| * show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+11
* | Disable sharing chooser blacklisting for lollipopDominik Schürmann2015-01-192-1/+2
|/
* Style tabs, add missing drawablesDominik Schürmann2015-01-155-567/+25
* Yubikey numkey by default to trueDominik Schürmann2015-01-141-0/+3
* Toolbar for settingsDominik Schürmann2015-01-144-14/+41
* Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-2/+6
* fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
* Fix SearchViewDominik Schürmann2015-01-141-20/+4
* Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-142-6/+12
* Launcher icon fixesDominik Schürmann2015-01-142-8/+7
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-144-23/+22
|\
| * make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-144-23/+22
* | Refactor BaseActivityDominik Schürmann2015-01-1322-48/+50
* | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1316-50/+91
* | Start working on Material DesignDominik Schürmann2015-01-137-53/+83
|/
* Merge pull request #1023 from adithyaphilip/developmentDominik Schürmann2015-01-121-7/+28
|\
| * fixed crash when file scheme is passed, broadened deletion scopeAbraham Philip2015-01-091-7/+28
* | Clearup after lockpattern experimentsDominik Schürmann2015-01-061-25/+25
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-063-8/+11
|\|
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-4/+6
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-021-1/+2
| * fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-301-32/+85
| |\
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+3
* | | Passphrase wizard testsDominik Schürmann2015-01-062-22/+627
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-12-292-4/+12
|\|
| * introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-292-4/+12
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-291-32/+85
|/
* Fix crash on first time wizardDominik Schürmann2014-12-281-2/+2
* Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
* remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
* retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
* Rename multi certify files to certifyDominik Schürmann2014-10-266-22/+17
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-1/+1
|\
| * disable cancel button instead of hiding it on cancel preventionVincent Breitmoser2014-10-261-1/+1
* | Fix notify after certifyDominik Schürmann2014-10-262-26/+20
|/
* Use new safe slinger activity from share tabDominik Schürmann2014-10-261-76/+26
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-8/+11
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-10/+10
| |\
| * | implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-8/+11
* | | Move advanced info into own activityDominik Schürmann2014-10-264-253/+214
| |/ |/|
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-262-3/+4