Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c6a3b63 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ibf39c2d70eee9872e32394797e6899e38fe7b40f
parents c128275b a0178237

packages/SystemUI/res/layout/keyguard_status_bar.xml

+2 −3
Original line number Diff line number Diff line
@@ -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"