From b59d359df06539a7220523c157cd25120b76de67 Mon Sep 17 00:00:00 2001
From: Peter Kalauskas <peskal@google.com>
Date: Tue, 30 Mar 2021 14:52:13 -0700
Subject: [PATCH] Update QS user switcher style

 - Right align to make room for clock

 - Decrease avatar size on phones from 48dp to 32dp

Bug: 183218164
Bug: 183949453
Bug: 181235684
Test: Build wembley-userdebug, observe lock screen
Change-Id: I91e620a50aac8b056519eccf102110ee4d609250
---
 packages/SystemUI/res/layout/keyguard_qs_user_switch.xml | 3 ++-
 packages/SystemUI/res/values/dimens.xml                  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml b/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml
index 3938b73d08ff8..a21a63c3e7c32 100644
--- a/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml
+++ b/packages/SystemUI/res/layout/keyguard_qs_user_switch.xml
@@ -22,7 +22,8 @@
     android:layout_width="@dimen/kg_framed_avatar_size"
     android:layout_height="@dimen/kg_framed_avatar_size"
     android:layout_centerHorizontal="true"
-    android:layout_gravity="center_horizontal|bottom"
+    android:layout_gravity="top|end"
+    android:layout_marginEnd="16dp"
     systemui:avatarPadding="0dp"
     systemui:badgeDiameter="18dp"
     systemui:badgeMargin="1dp"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index be0059407f1cb..9d5c687785858 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -818,7 +818,7 @@
     <!-- Size of user icon + frame in the qs user picker (incl. frame) -->
     <dimen name="qs_framed_avatar_size">54dp</dimen>
     <!-- Size of user icon + frame in the keyguard user picker (incl. frame) -->
-    <dimen name="kg_framed_avatar_size">48dp</dimen>
+    <dimen name="kg_framed_avatar_size">32dp</dimen>
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
     <dimen name="keyguard_carrier_text_margin">16dp</dimen>