From b77c2639d964c91998a15e6d1cc5a51bc58f1e60 Mon Sep 17 00:00:00 2001
From: lbill <lbill@google.com>
Date: Thu, 25 Aug 2022 09:53:27 +0000
Subject: [PATCH] Refine face enroll & remove button layout padding

The button include in the security_settings_face.xml
When FaceSettingsRemoveButtonPreferenceController#updateState(),
the margin of Button will be overrided by FooterButtonStyleUtils.
So we should set listPreferredItemPaddingStart or End for Button's
parent view instead.

Test: manual Security > Face Unlock > Delete face model
      > Set up face unlock > Back > Check the button layout
Bug: 202091542
Change-Id: I2b3815f5484ae1e5d256a43b432384e5f0f0f96a
---
 res/layout/face_enroll_button.xml | 5 +++--
 res/layout/face_remove_button.xml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/layout/face_enroll_button.xml b/res/layout/face_enroll_button.xml
index 09094d507db..62666503492 100644
--- a/res/layout/face_enroll_button.xml
+++ b/res/layout/face_enroll_button.xml
@@ -18,7 +18,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
 
     <Button
         android:id="@+id/security_settings_face_settings_enroll_button"
@@ -26,7 +28,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
-        android:layout_marginStart="20dp"
         android:text="@string/security_settings_face_settings_enroll"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/face_remove_button.xml b/res/layout/face_remove_button.xml
index ea860d5caae..2c2497ab1c5 100644
--- a/res/layout/face_remove_button.xml
+++ b/res/layout/face_remove_button.xml
@@ -18,7 +18,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
 
     <Button
         android:id="@+id/security_settings_face_settings_remove_button"
@@ -26,7 +28,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
-        android:layout_marginStart="20dp"
         android:text="@string/security_settings_face_settings_remove_face_model"/>
 
 </LinearLayout>
\ No newline at end of file