aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* More experimental work on api accountsDominik Schürmann2014-03-253-5/+19
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-251-2/+3
|\
| * Adjust encrypt layout, align signature with buttonThialfihar2014-03-231-2/+3
| |
* | More experimental work on API accountsDominik Schürmann2014-03-255-42/+138
|/
* Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-231-18/+10
|
* Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-213-93/+115
|
* Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-211-0/+38
|\ | | | | New Fix for #410
| * Fix for #410Nikhil Peter Raj2014-03-211-0/+38
| |
* | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵Daniel Hammann2014-03-201-3/+4
| | | | | | | | and clipboard button
* | Fix fingerprint handlingDominik Schürmann2014-03-201-3/+4
| |
* | Move fingerprint up below the algorithm in key viewThialfihar2014-03-201-15/+15
| | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification.
* | Move fingerprint to the right in key list entryThialfihar2014-03-201-8/+8
|/ | | | Fits much better there and doesn't separate the user ID.
* Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-201-3/+4
|
* Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-181-0/+7
|
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-181-0/+4
|\ | | | | Show revocation status in ViewKeyKeysAdapter #375
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-181-0/+4
| | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
* | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-184-8/+144
|\ \ | | | | | | Revamp certify dialogue
| * | certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-0/+87
| | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled.
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-5/+34
| | |
| * | 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
|/ /