Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Multi user avater View overlap privacy dot" into sc-dev am: a017823717

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15426438

Change-Id: Ibf39c2d70eee9872e32394797e6899e38fe7b40f
This commit is contained in:
Bill Lin
2021-08-03 07:24:08 +00:00
committed by Automerger Merge Worker
parent c128275b10 a017823717
commit 6c6a3b63ef
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/layout/keyguard_status_bar.xml
View File

@@ -30,6 +30,7 @@
android:id="@+id/status_icon_area" android:id="@+id/status_icon_area"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingEnd="@dimen/system_icons_keyguard_padding_end"
android:paddingTop="@dimen/status_bar_padding_top" android:paddingTop="@dimen/status_bar_padding_top"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:gravity="center_vertical|end" > android:gravity="center_vertical|end" >
@@ -38,12 +39,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="@dimen/system_icons_super_container_margin_start" android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
android:gravity="center_vertical|end" android:gravity="center_vertical|end">
android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >
<include layout="@layout/system_icons" /> <include layout="@layout/system_icons" />
</FrameLayout> </FrameLayout>
<ImageView android:id="@+id/multi_user_avatar" <ImageView android:id="@+id/multi_user_avatar"
android:layout_width="@dimen/multi_user_avatar_keyguard_size" android:layout_width="@dimen/multi_user_avatar_keyguard_size"
android:layout_height="@dimen/multi_user_avatar_keyguard_size" android:layout_height="@dimen/multi_user_avatar_keyguard_size"