diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 12:51:00 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 12:51:00 +0100 |
| commit | 7ac4f63ea367eaa4d560b04a211ed936da920685 (patch) | |
| tree | 2e5067afbb36ca93e92b46c4d72c9c0c589eddd3 /OpenKeychain/src/main/res | |
| parent | 4f11fb5a2f08ecf5fb81c86d590d04387cd1cd9a (diff) | |
| parent | 820005bc378ba91a9851902b651dfff7836c9bbf (diff) | |
| download | open-keychain-7ac4f63ea367eaa4d560b04a211ed936da920685.tar.gz open-keychain-7ac4f63ea367eaa4d560b04a211ed936da920685.tar.bz2 open-keychain-7ac4f63ea367eaa4d560b04a211ed936da920685.zip | |
Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator
Passphrase strength indicator
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_input_fragment.xml | 32 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml | 3 |
2 files changed, 9 insertions, 26 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index b320885d0..850f22716 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -58,33 +58,15 @@ android:layout_height="wrap_content" android:text="@string/label_passphrase" /> - <FrameLayout + <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText + android:id="@+id/create_key_passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"> - - <org.sufficientlysecure.keychain.ui.widget.PasswordEditText - android:id="@+id/create_key_passphrase" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:hint="@string/label_passphrase" - android:ems="10" - android:layout_gravity="center_horizontal" /> - - <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView - android:id="@+id/create_key_passphrase_strength" - android:layout_width="48dp" - android:layout_height="8dp" - android:layout_gravity="end|center_vertical" - custom:strength="medium" - custom:showGuides="false" - custom:color_fail="@color/android_red_light" - custom:color_weak="@color/android_orange_light" - custom:color_strong="@color/android_green_light" /> - - </FrameLayout> + android:imeOptions="actionNext" + android:inputType="textPassword" + android:hint="@string/label_passphrase" + android:ems="10" + android:layout_gravity="center_horizontal" /> <EditText android:id="@+id/create_key_passphrase_again" diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index 11355bbc0..5f323716c 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -21,7 +21,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp"> - <org.sufficientlysecure.keychain.ui.widget.PasswordEditText + <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText android:id="@+id/passphrase_passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -29,6 +29,7 @@ android:layout_marginBottom="8dp" android:imeOptions="actionNext" android:hint="@string/label_passphrase" + android:inputType="textPassword" android:ems="10" android:layout_gravity="center_horizontal" /> |