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

Commit c0365f1c authored by LuK1337's avatar LuK1337 Committed by Luca Stefani
Browse files

SystemUI: Apply system_icons_keyguard_padding_end to parent view 

* This fixes ugly padding when multiuser switch is visible
  and system_icons_keyguard_padding_end is overlayed to some
  custom value.

Change-Id: If5a1facac7f3b4c1569129ad9574e3c148323e10
parent 4259f457

packages/SystemUI/res/layout/keyguard_status_bar.xml

+3 −3
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:gravity="center_vertical|end" >

        android:gravity="center_vertical|end"

        android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >

        <FrameLayout android:id="@+id/system_icons_container"

            android:layout_width="0dp"

            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>

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+0 −4
Original line number Diff line number Diff line
@@ -144,10 +144,6 @@ public class KeyguardStatusBarView extends RelativeLayout 
        lp.setMarginStart(getResources().getDimensionPixelSize(

                R.dimen.system_icons_super_container_margin_start));

        mSystemIconsContainer.setLayoutParams(lp);

        mSystemIconsContainer.setPaddingRelative(mSystemIconsContainer.getPaddingStart(),

                mSystemIconsContainer.getPaddingTop(),

                getResources().getDimensionPixelSize(R.dimen.system_icons_keyguard_padding_end),

                mSystemIconsContainer.getPaddingBottom());



        // Respect font size setting.

        mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,