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

Commit ebf92378 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Adjusting paddings for status bar hover state 

Decreasing paddings for new visd and overriding vertical paddings for large screen in resources.
Also code changes to make sure paddings are updated when configuration changes.

Fixes: 288524704
Test: SystemIconsScreenshotTest
Change-Id: I5aab74a1f5fa4312df2260f6b8d20780c314bd3d
parent 8aef12b5

packages/SystemUI/res/values-sw600dp/dimens.xml

+6 −4
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ 
    <dimen name="status_bar_header_height_keyguard">@dimen/status_bar_height</dimen>



    <!-- padding for container with status icons and battery -->

    <dimen name="status_bar_icons_padding_end">12dp</dimen>

    <dimen name="status_bar_icons_padding_end">4dp</dimen>

    <!-- start padding is smaller to account for status icon margins coming from drawable itself -->

    <dimen name="status_bar_icons_padding_start">11dp</dimen>

    <dimen name="status_bar_icons_padding_start">3dp</dimen>

    <dimen name="status_bar_icons_padding_bottom">2dp</dimen>

    <dimen name="status_bar_icons_padding_top">2dp</dimen>



    <dimen name="status_bar_padding_end">0dp</dimen>
@@ -78,8 +80,8 @@ 


    <dimen name="large_screen_shade_header_height">42dp</dimen>

    <!-- start padding is smaller to account for status icon margins coming from drawable itself -->

    <dimen name="shade_header_system_icons_padding_start">11dp</dimen>

    <dimen name="shade_header_system_icons_padding_end">12dp</dimen>

    <dimen name="shade_header_system_icons_padding_start">3dp</dimen>

    <dimen name="shade_header_system_icons_padding_end">4dp</dimen>



    <!-- Lockscreen shade transition values -->

    <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen>

packages/SystemUI/res/values-sw720dp/dimens.xml

+0 −6
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
*/

-->

<resources>

    <!-- it's a bit smaller on 720dp to account for status_bar_icon_horizontal_margin -->

    <dimen name="status_bar_icons_padding_start">10dp</dimen>



    <!-- gap on either side of status bar notification icons -->

    <dimen name="status_bar_icon_horizontal_margin">1sp</dimen>
@@ -30,9 +27,6 @@ 


    <dimen name="large_screen_shade_header_height">56dp</dimen>



    <!-- it's a bit smaller on 720dp to account for status_bar_icon_horizontal_margin -->

    <dimen name="shade_header_system_icons_padding_start">10dp</dimen>



    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->

    <dimen name="biometric_auth_pattern_view_size">348dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -351,9 +351,9 @@ 


    <!-- paddings for container with status icons and battery -->

    <!-- padding start is a bit smaller than end to account for status icon margin-->

    <dimen name="status_bar_icons_padding_start">11dp</dimen>

    <dimen name="status_bar_icons_padding_start">3dp</dimen>



    <dimen name="status_bar_icons_padding_end">0dp</dimen>

    <dimen name="status_bar_icons_padding_end">4dp</dimen>

    <dimen name="status_bar_icons_padding_bottom">0dp</dimen>

    <dimen name="status_bar_icons_padding_top">0dp</dimen>
@@ -364,7 +364,7 @@ 
    <dimen name="status_bar_padding_start">8dp</dimen>



    <!-- the padding on the end of the statusbar -->

    <dimen name="status_bar_padding_end">8dp</dimen>

    <dimen name="status_bar_padding_end">4dp</dimen>



    <!-- the padding on the top of the statusbar (usually 0) -->

    <dimen name="status_bar_padding_top">0dp</dimen>
@@ -1607,7 +1607,7 @@ 
    <!-- Status bar user chip -->

    <dimen name="status_bar_user_chip_avatar_size">16dp</dimen>

    <!-- below also works as break between user chip and hover state of status icons -->

    <dimen name="status_bar_user_chip_end_margin">4dp</dimen>

    <dimen name="status_bar_user_chip_end_margin">8dp</dimen>

    <dimen name="status_bar_user_chip_text_size">12sp</dimen>



    <!-- System UI Dialog -->

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

+9 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class KeyguardStatusBarView extends RelativeLayout { 
    private int mStatusBarPaddingEnd;

    private int mMinDotWidth;

    private View mSystemIconsContainer;

    private View mSystemIcons;

    private final MutableStateFlow<DarkChange> mDarkChange = StateFlowKt.MutableStateFlow(

            DarkChange.EMPTY);
@@ -119,6 +120,7 @@ public class KeyguardStatusBarView extends RelativeLayout { 
    protected void onFinishInflate() {

        super.onFinishInflate();

        mSystemIconsContainer = findViewById(R.id.system_icons_container);

        mSystemIcons = findViewById(R.id.system_icons);

        mMultiUserAvatar = findViewById(R.id.multi_user_avatar);

        mCarrierLabel = findViewById(R.id.keyguard_carrier_text);

        mBatteryView = mSystemIconsContainer.findViewById(R.id.battery);
@@ -167,6 +169,13 @@ public class KeyguardStatusBarView extends RelativeLayout { 
                mStatusIconContainer.getPaddingBottom()

        );



        mSystemIcons.setPaddingRelative(

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

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

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

                getResources().getDimensionPixelSize(R.dimen.status_bar_icons_padding_bottom)

        );



        // Respect font size setting.

        mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                getResources().getDimensionPixelSize(

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

+13 −9
Original line number Diff line number Diff line
@@ -208,25 +208,29 @@ public class PhoneStatusBarView extends FrameLayout { 
        ViewGroup.LayoutParams layoutParams = getLayoutParams();

        mStatusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);

        layoutParams.height = mStatusBarHeight - waterfallTopInset;

        updatePaddings();

        setLayoutParams(layoutParams);

    }



        int statusBarPaddingTop = getResources().getDimensionPixelSize(

                R.dimen.status_bar_padding_top);

    private void updatePaddings() {

        int statusBarPaddingStart = getResources().getDimensionPixelSize(

                R.dimen.status_bar_padding_start);

        int statusBarPaddingEnd = getResources().getDimensionPixelSize(

                R.dimen.status_bar_padding_end);



        View sbContents = findViewById(R.id.status_bar_contents);

        sbContents.setPaddingRelative(

        findViewById(R.id.status_bar_contents).setPaddingRelative(

                statusBarPaddingStart,

                statusBarPaddingTop,

                statusBarPaddingEnd,

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

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

                0);



        findViewById(R.id.notification_lights_out)

                .setPaddingRelative(0, statusBarPaddingStart, 0, 0);



        setLayoutParams(layoutParams);

        findViewById(R.id.system_icons).setPaddingRelative(

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

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

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

                getResources().getDimensionPixelSize(R.dimen.status_bar_icons_padding_bottom)

        );

    }



    private void updateLayoutForCutout() {