aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Fix colors in item viewDominik Schürmann2014-03-132-2/+2
|
* remove unused colorDominik Schürmann2014-03-131-1/+0
|
* Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-134-55/+78
|
* Forgot faq fileDominik Schürmann2014-03-131-0/+12
|
* Add FAQ tab to helpDominik Schürmann2014-03-131-0/+1
|
* Readd create key menu itemsDominik Schürmann2014-03-132-4/+23
|
* XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-16/+10
|\ | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-128-17/+11
| |\ | | | | | | Lint error fix after testing
| | * Removing tabBhargav Golla2014-03-101-1/+1
| | |
| | * Removing unused stringBhargav Golla2014-03-101-1/+1
| | |
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1033-278/+949
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-108-18/+12
| | | |
* | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1213-133/+111
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| * | | add contact count to My Keys headerVincent Breitmoser2014-03-082-1/+20
| | | |
| * | | ditch old key list activitiesVincent Breitmoser2014-03-0811-289/+1
| | | |
| * | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-082-1/+35
| | | |
| * | | move some placeholders into resourcesVincent Breitmoser2014-03-082-2/+4
| | | |
| * | | working unified list (no actions yet)Vincent Breitmoser2014-03-083-2/+97
| | | |
| * | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-064-0/+124
| | | |
* | | | Add Email suggestions in Create Key activityuberspot2014-03-121-1/+1
| | | |
* | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-113-3/+0
| | | | | | | | | | | | | | | | imports and throw exceptions
* | | | Add export... button and functionality in multi-selectuberspot2014-03-112-0/+8
| | | |
* | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵uberspot2014-03-113-92/+0
| |_|/ |/| | | | | | | | via the method calls
* | | more tight layoutDominik Schürmann2014-03-111-12/+10
| | |
* | | linear layout edited to display test horizontallySreeram Boyapati2014-03-111-1/+4
| | |
* | | Appropriate save Icon in EditKeyActivityuberspot2014-03-117-0/+92
| | |
* | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-103-7/+26
|\ \ \ | | | | | | | | Fix to passphrase dialog and Issue #207
| * | | Added string reference for Issue #207Sreeram Boyapati2014-03-101-0/+2
| | | |
| * | | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-102-7/+24
| | | |
* | | | Pull from transifexDominik Schürmann2014-03-1023-269/+828
| |_|/ |/| |
* | | @color/white instead of hexDominik Schürmann2014-03-101-1/+1
| | |
* | | Revert "Lint changes"Dominik Schürmann2014-03-1011-16/+23
| | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
* | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1011-23/+16
|\ \ \ | | | | | | | | Lint changes #223
| * | | Lint changesBhargav Golla2014-03-1011-23/+16
| |/ / | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
* | | remove double definition of progress_generatingDominik Schürmann2014-03-101-1/+0
| | |
* | | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-091-0/+5
|\ \ \ | | | | | | | | progress is shown when creating the default key based on number of keys created till then
| * | | progress bar while key creation - added plurals based on no.of keys while ↵grait2014-03-091-1/+6
| | | | | | | | | | | | | | | | key creation
| * | | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| | | |
* | | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-092-40/+76
|/ / /
* | | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-091-2/+2
|\ \ \ | | | | | | | | Fix for #347
| * | | Fix for #347Nikhil Peter Raj2014-03-081-2/+2
| | | |
* | | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
| | | |
* | | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-081-0/+6
|\ \ \ \ | |_|/ / |/| | | Show error if file import has no content
| * | | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-031-0/+5
| | | |
| * | | Added FileHasNoContent stringDaniel Haß2014-03-031-0/+1
| | | |
* | | | Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0710-10/+13
|\ \ \ \ | | | | | | | | | | Minor code clean up
| * | | | move hardcode strings to strings.xmluberspot2014-03-0710-10/+13
| | | | |
* | | | | Move search view into onCreateView, fixes #365Dominik Schürmann2014-03-071-7/+0
|/ / / /
* | | | move search view from activity to fragment by setting it as a list header, ↵Dominik Schürmann2014-03-072-8/+7
| | | | | | | | | | | | | | | | better reusability! Required for service activites
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-16 16:04:06 +0000