aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-082-11/+1
|\
| * remove ui hack, use padding instead of marginVincent Breitmoser2014-10-081-10/+0
| * use "Key ID" for beautifyVincent Breitmoser2014-10-081-1/+1
* | New decryption screen UI with modernPGP iconsDominik Schürmann2014-10-083-104/+205
|/
* Filter key list by certified keysDominik Schürmann2014-10-081-0/+51
* Cleanup and fix decrypt activityDominik Schürmann2014-10-071-20/+32
* Certify designDominik Schürmann2014-10-071-12/+0
* get rid of some old code in LogDisplayFragmentVincent Breitmoser2014-10-061-70/+4
* certify: checkbox fake click area tidbitVincent Breitmoser2014-10-061-0/+10
* Fix app nameDominik Schürmann2014-10-051-0/+2
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-056-45/+49
|\
| * UI stuffDominik Schürmann2014-10-056-45/+49
* | add support for second line in log viewVincent Breitmoser2014-10-051-6/+43
* | add support for hierarchical log entriesVincent Breitmoser2014-10-051-4/+31
|/
* use status icons in public key selectionDominik Schürmann2014-10-053-24/+34
* Add cloud iconDominik Schürmann2014-10-051-0/+1
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-052-53/+58
|\
| * Give result down to listDominik Schürmann2014-10-052-50/+58
| * Make bit size optionalDominik Schürmann2014-10-051-3/+0
* | even more layout neatificationVincent Breitmoser2014-10-051-0/+1
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-054-7/+36
|\
| * preselect certify keyDominik Schürmann2014-10-054-10/+31
| * Display result in multi certifyDominik Schürmann2014-10-043-1/+9
* | more layout neatificationVincent Breitmoser2014-10-051-1/+1
* | slight layout changes to keyspinner_itemVincent Breitmoser2014-10-051-1/+1
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-041-2/+2
|\
| * use new multi certify, layout fixesDominik Schürmann2014-10-041-2/+2
* | merge key ids in getSelectedCertifyActionsVincent Breitmoser2014-10-042-24/+28
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-046-181/+221
|\
| * add dividerDominik Schürmann2014-10-041-3/+1
| * qr code download, cleanupDominik Schürmann2014-10-041-116/+62
| * Workings on new parcel for key downloadsDominik Schürmann2014-10-045-74/+125
| * Pass imported master key ids via result parcelDominik Schürmann2014-10-041-39/+24
| * Fixing import, start qr code stuffDominik Schürmann2014-10-041-50/+116
* | implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-043-0/+599
* | certify: get rid of fingerprint checkVincent Breitmoser2014-10-041-4/+3
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Dominik Schürmann2014-10-041-13/+16
|\
| * redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-041-13/+16
* | Import code, fix collision of key spinner with other loadersDominik Schürmann2014-10-046-45/+320
* | New add keys activityDominik Schürmann2014-10-044-4/+289
|/
* fix nullpointer on button push while data is still loadingVincent Breitmoser2014-10-031-0/+3
* Null check for getSelectedEntriesDominik Schürmann2014-10-031-1/+7
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-10-034-11/+10
|\
| * More beautifyKeyIdWithPrefixDominik Schürmann2014-10-032-3/+2
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-10-037-10/+42
| |\
| * | Fix nullpointer with clipboardDominik Schürmann2014-10-032-10/+9
* | | move IteratorWithSize interface into ParcelableFileCache - much cleanerVincent Breitmoser2014-10-032-7/+3
* | | actually use iterator interface for ParcelableFileCache in activitiesVincent Breitmoser2014-10-033-18/+47
* | | use iterator interface exclusively in ParcelableFileCacheVincent Breitmoser2014-10-031-1/+1
| |/ |/|
* | more getActivity() checksVincent Breitmoser2014-10-031-2/+11