aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* more code style changes in /ui and /utiluberspot2014-03-1313-99/+121
* more UI code style fixesuberspot2014-03-139-70/+77
* More code style fixes for /uiuberspot2014-03-1316-53/+91
* First code style changes in uiuberspot2014-03-1356-634/+486
* Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
|\
| * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
* | Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
* | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
* | Cleanup and simplificationDominik Schürmann2014-03-131-60/+23
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-132-12/+40
|\|
| * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
| |\
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1012-162/+236
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-102-1/+2
| * | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-121-12/+38
* | | | merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
* | | | keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-131-1/+6
* | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1210-729/+375
|\ \ \ \ | |/ / / |/| | |
| * | | add contact count to My Keys headerVincent Breitmoser2014-03-081-1/+10
| * | | better handling of multi select in ListKeysFragmentVincent Breitmoser2014-03-081-17/+22
| * | | ditch old key list activitiesVincent Breitmoser2014-03-087-1110/+1
| * | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-082-1/+30
| * | | move some placeholders into resourcesVincent Breitmoser2014-03-082-3/+2
| * | | Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-082-6/+9
| * | | Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-081-4/+2
| * | | working unified list (no actions yet)Vincent Breitmoser2014-03-084-244/+273
| * | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-063-0/+641
* | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1215-35/+57
|\ \ \ \
| * | | | Add Email suggestions in Create Key activityuberspot2014-03-121-5/+12
| * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-116-8/+10
| * | | | minor clean up in colorize methoduberspot2014-03-111-2/+3
| * | | | Add export... button and functionality in multi-selectuberspot2014-03-116-11/+21
| * | | | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-112-2/+4
| * | | | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-113-9/+9
| | |_|/ | |/| |
* / | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : FixedTharindu Wijewardane2014-03-111-0/+1
|/ / /
* | | cleanupDominik Schürmann2014-03-112-43/+37
* | | Merge pull request #392 from honnel/cursor-reset2Dominik Schürmann2014-03-111-0/+14
|\ \ \
| * | | OnFocusChangeListener replaced with OnActionExpandListenerDaniel Hammann2014-03-111-6/+10
| * | | Reset cursor query when closing search view #386Daniel Hammann2014-03-101-0/+10
| | |/ | |/|
* | | Appropriate save Icon in EditKeyActivityuberspot2014-03-111-1/+1
* | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-102-32/+83
|\ \ \
| * | | Added string reference for Issue #207Sreeram Boyapati2014-03-101-4/+4
| * | | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| * | | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-101-6/+44
* | | | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
* | | | getString before init of KeychainIntentHandlerDominik Schürmann2014-03-107-15/+14
* | | | Fix progress_generating and reformatDominik Schürmann2014-03-104-55/+68
| |/ / |/| |
* | | Revert "Lint changes"Dominik Schürmann2014-03-101-2/+0
* | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-101-0/+2
|\ \ \
| * | | Lint changesBhargav Golla2014-03-101-0/+2
| |/ /
* | | Make code more tidy for multiselectDominik Schürmann2014-03-104-44/+10