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

Commit 9406ddaa authored by Evan Laird's avatar Evan Laird Committed by Android (Google) Code Review
Browse files

Merge "Fix double counting of margins in keygaurd status bar view" into tm-dev

parents 17cea840 007be189

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

+1 −5
Original line number Diff line number Diff line
@@ -233,9 +233,6 @@ public class KeyguardStatusBarView extends RelativeLayout { 
        LinearLayout.LayoutParams lp =

                (LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();



        int marginStart = getResources().getDimensionPixelSize(

                R.dimen.system_icons_super_container_margin_start);



        // Use status_bar_padding_end to replace original

        // system_icons_super_container_avatarless_margin_end to prevent different end alignment

        // between PhoneStatusBarView and KeyguardStatusBarView
@@ -248,8 +245,7 @@ public class KeyguardStatusBarView extends RelativeLayout { 
        // 1. status bar layout: mPadding(consider round_corner + privacy dot)

        // 2. icon container: R.dimen.status_bar_padding_end



        if (marginEnd != lp.getMarginEnd() || marginStart != lp.getMarginStart()) {

            lp.setMarginStart(marginStart);

        if (marginEnd != lp.getMarginEnd()) {

            lp.setMarginEnd(marginEnd);

            mSystemIconsContainer.setLayoutParams(lp);

        }