From 73aada346046c09e8eed513bd1fc1e0b5585af01 Mon Sep 17 00:00:00 2001
From: lbill <lbill@google.com>
Date: Fri, 30 Jul 2021 06:39:00 +0000
Subject: [PATCH] Fix Multi user avater View overlap privacy dot

Move system_icons_super_container_margin_start to parent ViewGroup
to ensure both multi_user_avatar system_icons_container can share
the padding

Test: make and check visual, enable multi user and check keyguard
Bug: 194324044
Change-Id: Iab2803dfb2b609b98eb8053e3b81bd6731857a2b
---
 packages/SystemUI/res/layout/keyguard_status_bar.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index 2789ed125b096..eb7638233efd4 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -30,6 +30,7 @@
         android:id="@+id/status_icon_area"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:paddingEnd="@dimen/system_icons_keyguard_padding_end"
         android:paddingTop="@dimen/status_bar_padding_top"
         android:layout_alignParentEnd="true"
         android:gravity="center_vertical|end" >
@@ -38,12 +39,10 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
-            android:gravity="center_vertical|end"
-            android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >
+            android:gravity="center_vertical|end">
             <include layout="@layout/system_icons" />
         </FrameLayout>
 
-
         <ImageView android:id="@+id/multi_user_avatar"
             android:layout_width="@dimen/multi_user_avatar_keyguard_size"
             android:layout_height="@dimen/multi_user_avatar_keyguard_size"