aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Include signature result in fragmentsDominik Schürmann2014-03-303-45/+38
|
* Decrypt mostly works againDominik Schürmann2014-03-302-131/+12
|
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-303-141/+207
|
* Experiments with fragments in decrypt activityDominik Schürmann2014-03-304-96/+182
|
* merge masterAshley Hughes2014-03-2948-956/+1467
|\
| * Show divider only when usedDominik Schürmann2014-03-261-2/+2
| |
| * Text for creation of new api accountsDominik Schürmann2014-03-261-0/+8
| |
| * Rename layouts for remote activityDominik Schürmann2014-03-264-0/+0
| |
| * Accounts activity prettifiedDominik Schürmann2014-03-261-8/+28
| |
| * Accounts list prettifiedDominik Schürmann2014-03-262-6/+15
| |
| * fix capability icons and remove red text for revoked keysuberspot2014-03-261-15/+18
| |
| * Merge pull request #482 from uberspot/masterDominik Schürmann2014-03-261-15/+22
| |\ | | | | | | Fix style for expired/revoked keys
| | * put expiry on a separate lineuberspot2014-03-261-15/+22
| | |
| * | Part 2 of basic user interface for api accountsDominik Schürmann2014-03-261-54/+21
| |/
| * Accounts API, user interfaceDominik Schürmann2014-03-262-0/+36
| |
| * Merge pull request #479 from AlexanderS/subkey-expiryDominik Schürmann2014-03-261-1/+9
| |\ | | | | | | Display expiry of subkeys in single key view.
| | * Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-1/+9
| | |
| * | Merge pull request #474 from honnel/empty-list-flashDominik Schürmann2014-03-251-2/+3
| |\ \ | | | | | | | | Empty list flash
| | * | No "empty-list" layout flashing up on start of OpenKeychainDaniel Hammann2014-03-231-2/+3
| | | |
| * | | 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
| | | | |