From e8bd78e2124624428a15bbd7a0d960efaa914e24 Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Fri, 5 Jul 2019 10:56:15 +0800
Subject: [PATCH] Add margin between password entry and error text

Fixes: 130664317
Test: visual
Change-Id: Iefdbd39b94a861736baf8e9a302fbf651a5b14d3
---
 res/layout/choose_lock_password.xml         | 1 +
 res/layout/confirm_lock_password_base.xml   | 1 +
 res/layout/confirm_lock_password_normal.xml | 3 +++
 res/layout/password_requirement_item.xml    | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index be947dc3379..39145518018 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -63,6 +63,7 @@
                 style="@style/TextAppearance.PasswordEntry"/>
 
             <androidx.recyclerview.widget.RecyclerView
+                android:layout_marginTop="8dp"
                 android:id="@+id/password_requirements_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index ed25e747174..19a9fbb1feb 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -84,6 +84,7 @@
                 android:id="@+id/errorText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginStart="12dp"
                 android:layout_marginEnd="12dp"/>
 
diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml
index 61d8505c2f9..9021f2428f0 100644
--- a/res/layout/confirm_lock_password_normal.xml
+++ b/res/layout/confirm_lock_password_normal.xml
@@ -61,6 +61,9 @@
                 style="@style/TextAppearance.ErrorText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
                 android:accessibilityLiveRegion="polite"/>
 
         </LinearLayout>
diff --git a/res/layout/password_requirement_item.xml b/res/layout/password_requirement_item.xml
index ff7e04c354f..40bf742bb46 100644
--- a/res/layout/password_requirement_item.xml
+++ b/res/layout/password_requirement_item.xml
@@ -19,4 +19,4 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="?attr/sudGlifHeaderGravity"
-    android:textSize="14sp"/>
+    android:textSize="@*android:dimen/text_size_body_1_material"/>