From 73305b4458ebdd3828b3b12878ad8bab63a225db Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Mon, 28 Jun 2021 11:46:39 +0800
Subject: [PATCH] Tweak Factory reset page for Material Next style

- Change Text appearences

Bug: 189389716
Test: Visual
Change-Id: I0bcc40c62892c12f9c3dcd74873906d96b392e86
---
 res/layout/main_clear.xml                 | 23 +++++++++++------------
 res/layout/main_clear_account.xml         |  6 +++---
 res/layout/main_clear_confirm.xml         |  2 +-
 res/values/dimens.xml                     |  2 --
 tests/robotests/res/layout/main_clear.xml |  4 +---
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/res/layout/main_clear.xml b/res/layout/main_clear.xml
index cbccb0a11ad..a2464e2c986 100644
--- a/res/layout/main_clear.xml
+++ b/res/layout/main_clear.xml
@@ -27,40 +27,39 @@
     <ScrollView
         android:id="@+id/main_clear_scrollview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/reset_main_clear_margin_start"
-        android:layout_marginEnd="@dimen/reset_main_clear_margin_end">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:id="@+id/main_clear_container"
             style="@style/SudContentFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:orientation="vertical">
 
             <TextView
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:id="@+id/sud_layout_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/main_clear_desc"/>
             <TextView
                 android:id="@+id/also_erases_external"
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:text="@string/main_clear_desc_also_erases_external"/>
             <TextView
                 android:id="@+id/also_erases_esim"
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:text="@string/main_clear_desc_also_erases_esim"/>
             <TextView
                 android:id="@+id/accounts_label"
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
@@ -76,21 +75,21 @@
             </LinearLayout>
             <TextView
                 android:id="@+id/other_users_present"
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:text="@string/main_clear_other_users_present"/>
             <TextView
                 android:id="@+id/no_cancel_mobile_plan"
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:text="@string/main_clear_desc_no_cancel_mobile_plan"/>
             <TextView
                 android:id="@+id/erase_external_option_text"
-                style="@style/TextAppearance.SudGlifItemSummary"
+                style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/main_clear_desc_erase_external_storage"/>
@@ -116,12 +115,12 @@
                     android:layout_gravity="center_vertical"
                     android:orientation="vertical">
                     <TextView
-                        style="@style/TextAppearance.SudGlifItemTitle"
+                        style="@style/TextAppearance.PreferenceTitle.SettingsLib"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/erase_external_storage"/>
                     <TextView
-                        style="@style/TextAppearance.SudGlifItemSummary"
+                        style="?android:attr/textAppearanceListItemSecondary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/erase_external_storage_description"/>
diff --git a/res/layout/main_clear_account.xml b/res/layout/main_clear_account.xml
index f95a44fc0cf..6dbf4d84200 100644
--- a/res/layout/main_clear_account.xml
+++ b/res/layout/main_clear_account.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,6 +30,6 @@
         android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.SudGlifItemSummary"/>
+        style="@style/TextAppearance.PreferenceTitle.SettingsLib"/>
 </LinearLayout>
 
diff --git a/res/layout/main_clear_confirm.xml b/res/layout/main_clear_confirm.xml
index 914a99882e2..c5601c78e20 100644
--- a/res/layout/main_clear_confirm.xml
+++ b/res/layout/main_clear_confirm.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/sud_layout_description"
-            style="@style/SudItemTitle.GlifDescription"
+            style="@style/TextAppearance.PreferenceTitle.SettingsLib"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/main_clear_final_desc"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 908b6401aed..fe0ada08622 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -327,8 +327,6 @@
     <!-- Margin for the reset screens -->
     <dimen name="reset_network_margin_start">72dp</dimen>
     <dimen name="reset_network_margin_end">12dp</dimen>
-    <dimen name="reset_main_clear_margin_start">32dp</dimen>
-    <dimen name="reset_main_clear_margin_end">12dp</dimen>
     <dimen name="reset_button_margin_end">20dp</dimen>
 
     <!-- Padding for the reset screens -->
diff --git a/tests/robotests/res/layout/main_clear.xml b/tests/robotests/res/layout/main_clear.xml
index 868d88f6c84..b9a126d423f 100644
--- a/tests/robotests/res/layout/main_clear.xml
+++ b/tests/robotests/res/layout/main_clear.xml
@@ -28,9 +28,7 @@
     <ScrollView
         android:id="@+id/main_clear_scrollview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/reset_main_clear_margin_start"
-        android:layout_marginEnd="@dimen/reset_main_clear_margin_end">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:id="@+id/main_clear_container"