1 files changed, 27 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
index 09e37ee56..11355bbc0 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
     android:orientation="vertical"
@@ -14,17 +15,35 @@
         android:layout_height="wrap_content"
         android:text="@string/label_no_passphrase" />
 
-    <EditText
-        android:id="@+id/passphrase_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">
+
+        <org.sufficientlysecure.keychain.ui.widget.PasswordEditText
+            android:id="@+id/passphrase_passphrase"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            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/passphrase_repeat_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/passphrase_passphrase_again"