From 4e168dd691e20d4ebb5b2f53afb7c2beadbe849d Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Tue, 18 May 2021 05:36:30 +0800
Subject: [PATCH] Visual update for FaceSettings

This includes the following changes:
- Remove the face animation from FaceSettings page
- Correct the color filling of collapsing toolbar
- Make the button align with other settings
- Remove the seperator

Fix: 186804060
Fix: 187882118
Test: visual verified
Change-Id: I4b7679ced0c420b4d23a3c326ac2a93734c0b8bb
---
 AndroidManifest.xml                |  1 +
 res/layout/face_enroll_button.xml  |  2 +-
 res/layout/face_remove_button.xml  |  2 +-
 res/xml/security_settings_face.xml | 13 ++-----------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 61c0c4ea2db..41adfb3df79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -473,6 +473,7 @@
 
         <activity android:name="Settings$FaceSettingsActivity"
             android:label="@string/security_settings_face_preference_title"
+            android:theme="@style/Theme.SubSettings"
             android:exported="true"
             android:icon="@drawable/ic_face_header">
             <intent-filter>
diff --git a/res/layout/face_enroll_button.xml b/res/layout/face_enroll_button.xml
index f40c42c4bf1..2e7ba8dc4c6 100644
--- a/res/layout/face_enroll_button.xml
+++ b/res/layout/face_enroll_button.xml
@@ -22,7 +22,7 @@
 
     <Button
         android:id="@+id/security_settings_face_settings_enroll_button"
-        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:layout_marginStart="20dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
diff --git a/res/layout/face_remove_button.xml b/res/layout/face_remove_button.xml
index a05fb85a85b..2bbaca9494d 100644
--- a/res/layout/face_remove_button.xml
+++ b/res/layout/face_remove_button.xml
@@ -22,7 +22,7 @@
 
     <Button
         android:id="@+id/security_settings_face_settings_remove_button"
-        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:layout_marginStart="20dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index e1ac9b35b64..147c4ca2b09 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -19,12 +19,6 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/security_settings_face_preference_title">
 
-    <com.android.settings.widget.VideoPreference
-        android:key="security_settings_face_video"
-        android:title="@string/summary_placeholder"
-        settings:animation="@raw/face_settings"
-        settings:controller="com.android.settings.widget.VideoPreferenceController"/>
-
     <com.android.settingslib.widget.TopIntroPreference
         android:title="@string/security_settings_face_settings_top_intro"
         settings:searchable="false"/>
@@ -83,19 +77,16 @@
             android:key="security_settings_face_delete_faces_container"
             android:title="@string/security_settings_face_settings_remove_face_model"
             android:selectable="false"
-            android:layout="@layout/face_remove_button"
-            settings:allowDividerBelow="true"/>
+            android:layout="@layout/face_remove_button"/>
 
         <com.android.settingslib.widget.LayoutPreference
             android:key="security_settings_face_enroll_faces_container"
             android:title="@string/security_settings_face_settings_enroll"
             android:selectable="false"
-            android:layout="@layout/face_enroll_button"
-            settings:allowDividerBelow="true"/>
+            android:layout="@layout/face_enroll_button"/>
     </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="security_face_footer"
-        settings:allowDividerAbove="true"
         settings:controller="com.android.settings.biometrics.face.FaceSettingsFooterPreferenceController" />
 </PreferenceScreen>