From 88600e79166364eedc1fd348870373664f74c92e Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Fri, 28 May 2021 17:35:03 +0800
Subject: [PATCH] Relayout Reset Wifi page

- Update textAppearance
- Adjust padding
- Update Button style

Fixes: 189389538
Test: visual verify
Change-Id: I03fe9368c0f3140990f96b6418034e14cb7ce813
---
 res/layout/reset_esim_checkbox.xml   | 4 ++--
 res/layout/reset_network.xml         | 6 +++---
 res/layout/reset_network_confirm.xml | 6 +++---
 res/values/styles.xml                | 4 +++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/res/layout/reset_esim_checkbox.xml b/res/layout/reset_esim_checkbox.xml
index 44b9a289149..626ecc3b22d 100644
--- a/res/layout/reset_esim_checkbox.xml
+++ b/res/layout/reset_esim_checkbox.xml
@@ -43,13 +43,13 @@
         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/reset_esim_title"/>
 
         <TextView
-            style="@style/TextAppearance.SudGlifItemSummary"
+            style="?android:attr/textAppearanceSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/reset_esim_desc"/>
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index 47fa56ad44f..ac1563e5fbf 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -18,12 +18,12 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical" >
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginStart="@dimen/reset_network_margin_start"
-        android:layout_marginEnd="@dimen/reset_network_margin_end"
         android:layout_marginTop="12dp"
         android:layout_weight="1">
         <LinearLayout
@@ -33,7 +33,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="18sp"
+                android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:textDirection="locale"
                 android:text="@string/reset_network_desc" />
             <include layout="@layout/reset_esim_checkbox"/>
diff --git a/res/layout/reset_network_confirm.xml b/res/layout/reset_network_confirm.xml
index 456049e3045..4a95942448b 100644
--- a/res/layout/reset_network_confirm.xml
+++ b/res/layout/reset_network_confirm.xml
@@ -22,10 +22,10 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/reset_network_margin_start"
-        android:layout_marginEnd="@dimen/reset_network_margin_end"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:layout_marginTop="12dp"
-        android:textSize="18sp"
+        android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"
         android:text="@string/reset_network_final_desc" />
     <Button
         android:id="@+id/execute_reset_network"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a5b187bf94e..d174e00eadc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -409,7 +409,9 @@
         <item name="android:scaleY">0.5</item>
     </style>
 
-    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
+    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored">
+        <item name="android:theme">@style/RoundedCornerThemeOverlay</item>
+    </style>
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
 
     <style name="RoundedCornerThemeOverlay">