aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+12
| | | |
| | * | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+11
| | |/
| * / Lock drawer as open in tabletsuberspot2014-03-1611-666/+693
| |/
| * Fix colors in item viewDominik Schürmann2014-03-131-1/+1
| |
| * Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-132-54/+69
| |
| * XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-134-12/+6
| |\ | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-124-12/+6
| | |\ | | | | | | | | Lint error fix after testing
| | | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-105-9/+119
| | | |\
| | | * | Lint changes after testingBhargav Golla2014-03-104-12/+6
| | | | |
| * | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-128-85/+91
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-1/+15
| | | | |
| | * | | ditch old key list activitiesVincent Breitmoser2014-03-087-231/+1
| | | | |
| | * | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-1/+31
| | | | |
| | * | | move some placeholders into resourcesVincent Breitmoser2014-03-081-2/+2
| | | | |
| | * | | working unified list (no actions yet)Vincent Breitmoser2014-03-083-2/+97
| | | | |
| | * | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-062-0/+97
| | | | |
| * | | | 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
| * | | | 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-113-0/+92
| | | |
| * | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-102-7/+24
| |\ \ \ | | |_|/ | |/| | Fix to passphrase dialog and Issue #207
| | * | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-102-7/+24
| | | |
| * | | @color/white instead of hexDominik Schürmann2014-03-101-1/+1
| | | |
| * | | Revert "Lint changes"Dominik Schürmann2014-03-107-11/+18
| | | | | | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
| * | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-107-18/+11
| |\ \ \ | | | | | | | | | | Lint changes #223
| | * | | Lint changesBhargav Golla2014-03-107-18/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
| * | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-091-40/+74
| | | |
| * | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
| |/ /
| * | Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-079-10/+10
| |\ \ | | | | | | | | Minor code clean up
| | * | move hardcode strings to strings.xmluberspot2014-03-079-10/+10
| | | |
| * | | 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
| * | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-071-54/+85
| | |
| * | Add option for sharing encrypted file.Miroojin Bakshi2014-03-071-0/+13
| | |
* | | keep up with masterAshley Hughes2014-03-076-11/+19
|\| |
| * | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-062-5/+5
| |\ \ | | | | | | | | #338
| | * | corrected commitAnkush2014-03-072-5/+5
| | |/ | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
| * / Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-061-0/+8
| |/
| * Fix ScrollViewSize Lint WarningsEmantor2014-03-033-6/+6
| |
* | master mergeAshley Hughes2014-02-2216-436/+565
|\|
| * certifications textDominik Schürmann2014-02-191-0/+7
| |
| * fix marginsDominik Schürmann2014-02-171-2/+2
| |
| * prevent key view from scrolling, move encrypt button down againDominik Schürmann2014-02-171-17/+21
| |
| * Layout fixes for registered appsDominik Schürmann2014-02-134-149/+150
| |
| * rework key view into fragments to later add certificationsDominik Schürmann2014-02-095-231/+265
| |
| * fix certify key resourceDominik Schürmann2014-02-051-1/+1
| |
| * drawer icons have not the same width, fix thisDominik Schürmann2014-02-051-1/+1
| |