aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-05 23:29:43 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-05 23:29:43 +0100
commit23b8e8272cfd1b2f9f56771f30b944c93db53d9d (patch)
tree3aba47ab5b0de2e978a6d89b6f0739b9cc0b2f6f /OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
parente50eda4e29e4618e29756f19ec67b1d5ac0e9733 (diff)
parent438314c4bb092235331484262183d68810d6cd8f (diff)
downloadopen-keychain-23b8e8272cfd1b2f9f56771f30b944c93db53d9d.tar.gz
open-keychain-23b8e8272cfd1b2f9f56771f30b944c93db53d9d.tar.bz2
open-keychain-23b8e8272cfd1b2f9f56771f30b944c93db53d9d.zip
Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/create_key_input_fragment.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_input_fragment.xml34
1 files changed, 26 insertions, 8 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 d817f9269..d7be00bcd 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -58,17 +59,34 @@
android:layout_height="wrap_content"
android:text="@string/label_passphrase" />
- <EditText
- android:id="@+id/create_key_passphrase"
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:layout_marginBottom="8dp"
- android:imeOptions="actionNext"
- android:inputType="textPassword"
- android:hint="@string/label_passphrase"
- android:ems="10"
- android:layout_gravity="center_horizontal" />
+ android:layout_marginBottom="8dp">
+
+ <EditText
+ android:id="@+id/create_key_passphrase"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:imeOptions="actionNext"
+ android:inputType="textPassword"
+ 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>
<EditText
android:id="@+id/create_key_passphrase_again"