Javier Varona c216dfa209 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop ... # Conflicts: # app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java		2018-10-24 23:07:11 -04:00
..
anim	In the backup seed screen there is not option for brainkey backup	2018-09-06 14:22:42 -05:00
animator	Fix conflicts	2017-08-18 19:48:51 -03:00
drawable	Change the buttons style to the buttons to material one in the backup_seed.xml and java source	2018-10-12 14:26:17 -05:00
drawable-xhdpi	Fixed spinner view in transaction window	2018-09-12 21:34:27 -05:00
font	Changed names of opensans font to avoid naming errors	2017-12-23 19:58:49 -06:00
layout	Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop	2018-10-24 23:07:11 -04:00
mipmap-anydpi-v26	Add temporal application logo	2018-05-25 12:21:55 -05:00
mipmap-hdpi	Change app logo	2018-05-25 13:51:41 -05:00
mipmap-mdpi	Change app logo	2018-05-25 13:51:41 -05:00
mipmap-xhdpi	Change app logo	2018-05-25 13:51:41 -05:00
mipmap-xxhdpi	Change app logo	2018-05-25 13:51:41 -05:00
mipmap-xxxhdpi	Change app logo	2018-05-25 13:51:41 -05:00
raw	New unit test implementation github style for some UI implementations	2018-08-27 07:31:55 -05:00
values	When the PATTERN is typed 4 wrong times, it has to block 15 seconds before make new tries	2018-10-24 02:59:42 -05:00
xml	- Added Pocket Security Functionality (still in progress...)	2018-07-26 22:58:12 -04:00