From de14bf4ab906ab2c437bf743c79eb1e20c28c8b6 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Mon, 3 May 2021 18:18:15 +0800
Subject: [PATCH] Update user profile picker style

- Change icon size from 56dp to 24dp
- Update layout and font style

Bug: 186608032
Bug: 186609520
Test: visual

Change-Id: I24a413fb118110fac6c52e81007e537c8717999a
---
 packages/SettingsLib/res/layout/user_preference.xml | 6 ++----
 packages/SettingsLib/res/values/dimens.xml          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/SettingsLib/res/layout/user_preference.xml b/packages/SettingsLib/res/layout/user_preference.xml
index aa07713e7f691..f13447a4737c2 100644
--- a/packages/SettingsLib/res/layout/user_preference.xml
+++ b/packages/SettingsLib/res/layout/user_preference.xml
@@ -27,9 +27,7 @@
             android:layout_width="@dimen/user_icon_view_height"
             android:layout_height="@dimen/user_icon_view_height"
             android:layout_gravity="center"
-            android:scaleType="fitCenter"
-            android:paddingBottom="@dimen/user_spinner_padding"
-            android:paddingTop="@dimen/user_spinner_padding" />
+            android:scaleType="fitCenter" />
 
     <TextView
             android:id="@android:id/title"
@@ -42,6 +40,6 @@
             android:fadingEdge="horizontal"
             android:paddingStart="@dimen/user_spinner_padding"
             android:paddingEnd="@dimen/user_spinner_padding"
-            style="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml
index 9d5b231661906..c439cf040cf28 100644
--- a/packages/SettingsLib/res/values/dimens.xml
+++ b/packages/SettingsLib/res/values/dimens.xml
@@ -25,7 +25,7 @@
     <dimen name="circle_avatar_size">40dp</dimen>
 
     <!-- Height of a user icon view -->
-    <dimen name="user_icon_view_height">56dp</dimen>
+    <dimen name="user_icon_view_height">24dp</dimen>
     <!-- User spinner -->
     <dimen name="user_spinner_height">72dp</dimen>
     <dimen name="user_spinner_padding">4dp</dimen>