aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Expand)AuthorAgeFilesLines
* Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-203-13/+43
* Merge branch 'master' into improve-file-moremar-v-in2014-07-069-120/+265
|\
| * Use strings in edit keyDominik Schürmann2014-07-031-4/+4
| * Remove old edit button, rename activitiesDominik Schürmann2014-07-031-16/+0
| * Cache passphrase for editDominik Schürmann2014-07-032-7/+92
| * edit key: subkey adapterDominik Schürmann2014-07-032-1/+97
| * Work on editDominik Schürmann2014-07-032-8/+0
| * A little bit less purpleDominik Schürmann2014-07-022-7/+4
| * edit key: work on savingDominik Schürmann2014-07-021-8/+0
| * Edit key: adding user idsDominik Schürmann2014-07-024-15/+72
| * edit key: part 3Dominik Schürmann2014-07-011-60/+0
* | Many changes to file ... and still incompletemar-v-in2014-07-0610-237/+253
* | Encrypt/Decrypt UI workmar-v-in2014-07-023-79/+108
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-90/+60
|\
| * (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| * Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-307-0/+321
| |\
| * | Converted all other buttonsDaniel Albert2014-06-305-30/+23
| * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-294-21/+13
| * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-5/+3
| * | Added new button style and converted account_settings and the select_secret_k...Daniel Albert2014-06-292-10/+8
| * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-291-6/+3
| * | Improved button styleDaniel Albert2014-06-292-15/+6
| * | Added button_rounded styleDaniel Albert2014-06-281-3/+9
* | | work on edit keyDominik Schürmann2014-06-303-6/+2
| |/ |/|
* | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-0/+6
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-286-0/+315
|\ \ | |/ |/|
| * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-1/+1
| * More wizardryDominik Schürmann2014-06-272-15/+43
| * Start work on a first-time wizardDominik Schürmann2014-06-274-0/+217
| * new edit key: first version to add user idsDominik Schürmann2014-06-242-0/+70
* | Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-271-3/+5
* | Swapped out FontawesomeText with normal ImageViewDaniel Albert2014-06-261-10/+6
|/
* remove margin in import keys (leftover from nav drawer)Dominik Schürmann2014-06-231-2/+0
* new edit key: diff for existing user idsDominik Schürmann2014-06-222-10/+21
* add buttons in edit keyDominik Schürmann2014-06-221-0/+64
* Start new designed activityDominik Schürmann2014-06-213-0/+73
* Use actionbar button for log activityDominik Schürmann2014-06-201-30/+0
* Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-19/+0
* Reference ic_launcher instead of iconDominik Schürmann2014-06-183-3/+3
* decrease size of search icons in importDominik Schürmann2014-06-182-2/+2
* Fix new actionbar icon sizes, rename icon to ic_launcher following Android na...Dominik Schürmann2014-06-181-2/+2
* consistent button design in import activityDominik Schürmann2014-06-182-18/+0
* Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-189-120/+201
* Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
* Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-132-2/+2
|\
| * Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-062-2/+2
* | import-log: work on log fragment uiVincent Breitmoser2014-06-101-1/+9
* | import-log: add LogDisplay activityVincent Breitmoser2014-06-104-17/+91
|/
* Layout fixes for key importDominik Schürmann2014-05-199-66/+58
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 07:19:46 +0000