cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
This commit is contained in:
Dominik Schürmann
2015-03-05 23:29:43 +01:00
parent e50eda4e29 438314c4bb
commit 23b8e8272c
6 changed files with 536 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/res/values/attr.xml
View File

@@ -15,4 +15,18 @@
</attr>
</declare-styleable>
<!-- Taken from Matt Allen Password Strength View
https://github.com/matt-allen/android-password-strength-indicator -->
<declare-styleable name="PasswordStrengthView">
<attr name="strength" format="enum">
<enum name="weak" value="0" />
<enum name="medium" value="1" />
<enum name="strong" value="2" />
</attr>
<attr name="showGuides" format="boolean" />
<attr name="color_fail" format="color" />
<attr name="color_weak" format="color" />
<attr name="color_strong" format="color" />
</declare-styleable>
</resources>