From 7f9c663033f843b43eb36f72fcace658ad25bac3 Mon Sep 17 00:00:00 2001
From: Lukas Zorich <lukas.zorich@gmail.com>
Date: Tue, 3 Mar 2015 18:51:06 -0300
Subject: Add license to password strength view classes

---
 .../src/main/res/layout/create_key_input_fragment.xml       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout')

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 f678825aa..76a58acb1 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">
 
@@ -63,13 +64,23 @@
                 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" />
 
+            <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView
+                android:id="@+id/create_key_passphrase_strength"
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:layout_marginBottom="8dp"
+                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"/>
+
             <EditText
                 android:id="@+id/create_key_passphrase_again"
                 android:layout_width="match_parent"
-- 
cgit v1.2.3


From 438314c4bb092235331484262183d68810d6cd8f Mon Sep 17 00:00:00 2001
From: Lukas Zorich <lukas.zorich@gmail.com>
Date: Tue, 3 Mar 2015 18:52:10 -0300
Subject: Integrates passphrase strength indicator to create key wizard.

This commit patches issue #1050. The padding set in the passphrase edit
text is set programmatically because there is a bug in appcompat-v7
where padding via xml doesn't work:

http://code.google.com/p/android/issues/detail?id=77982
---
 .../main/res/layout/create_key_input_fragment.xml  | 43 +++++++++++++---------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

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 76a58acb1..d59cd7b86 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -59,27 +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: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="match_parent"
-                android:layout_height="8dp"
-                android:layout_marginBottom="8dp"
-                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"/>
+                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"
-- 
cgit v1.2.3


From 18a827eeed042ffb43338e06f408b78b0a6a3394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Mar 2015 11:06:17 +0100
Subject: Design fixes for decryption screen

---
 OpenKeychain/src/main/res/layout/decrypt_result_include.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 7317e7742..9d47009b9 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -118,7 +118,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:text="Show"
-                android:drawableRight="@drawable/ic_action_accounts"
+                android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 style="@style/SelectableItem" />
-- 
cgit v1.2.3


From d83219f3a0915c30b297aeaadfb37f1ba966d5c1 Mon Sep 17 00:00:00 2001
From: chipset95 <chipset95@yahoo.co.in>
Date: Fri, 6 Mar 2015 11:13:56 +0530
Subject: Created EmailEditText, PasswordEditText and implemented wherever
 required

---
 .../src/main/res/layout/add_user_id_dialog.xml     |  3 +-
 .../main/res/layout/create_key_input_fragment.xml  | 12 ++++----
 .../main/res/layout/passphrase_repeat_dialog.xml   | 35 +++++++++++++++++-----
 3 files changed, 33 insertions(+), 17 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
index 79137bf51..c1b97b02c 100644
--- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
@@ -8,13 +8,12 @@
     android:paddingLeft="24dp"
     android:paddingRight="24dp">
 
-    <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView
+    <org.sufficientlysecure.keychain.ui.widget.EmailEditText
         android:id="@+id/add_user_id_address"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/label_email"
         android:imeOptions="actionNext"
-        android:inputType="textAutoCorrect|textEmailAddress"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView
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 d7be00bcd..b320885d0 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -1,6 +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"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -43,13 +43,12 @@
                 android:hint="@string/create_key_hint_full_name"
                 android:ems="10" />
 
-            <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView
+            <org.sufficientlysecure.keychain.ui.widget.EmailEditText
                 android:id="@+id/create_key_email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
                 android:imeOptions="actionNext"
-                android:inputType="textAutoCorrect|textEmailAddress"
                 android:hint="@string/label_email"
                 android:ems="10" />
 
@@ -65,15 +64,14 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp">
 
-                <EditText
+                <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:inputType="textPassword"
                     android:hint="@string/label_passphrase"
                     android:ems="10"
-                    android:layout_gravity="center_horizontal"  />
+                    android:layout_gravity="center_horizontal" />
 
                 <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView
                     android:id="@+id/create_key_passphrase_strength"
@@ -84,7 +82,7 @@
                     custom:showGuides="false"
                     custom:color_fail="@color/android_red_light"
                     custom:color_weak="@color/android_orange_light"
-                    custom:color_strong="@color/android_green_light"/>
+                    custom:color_strong="@color/android_green_light" />
 
             </FrameLayout>
 
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"
-- 
cgit v1.2.3