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

Commit 197709fe authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[SB][Chips] Increase padding between chips, and between clock & notifs." into main

parents 39a9943d 4bfbb0a5

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ 
    <dimen name="status_bar_clock_starting_padding">4dp</dimen>



    <!-- The end padding for the clock in the status bar. -->

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

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



    <!-- Starting padding for a left-aligned status bar clock -->

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

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChips.kt

+5 −8
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ import androidx.compose.runtime.SideEffect 
import androidx.compose.runtime.key

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.unit.dp

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.res.R

import com.android.systemui.statusbar.chips.StatusBarChipsReturnAnimations

import com.android.systemui.statusbar.chips.ui.model.MultipleOngoingActivityChipsModel

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder
@@ -53,13 +52,11 @@ fun OngoingActivityChips( 
    val shownChips = chips.active.filter { !it.isHidden }

    if (shownChips.isNotEmpty()) {

        Row(

            modifier =

                modifier

                    .fillMaxHeight()

                    .padding(start = dimensionResource(R.dimen.ongoing_activity_chip_margin_start)),

            // The status bar clock will have some end padding so we don't need as much padding

            // at the beginning of the row (but we need more padding between chips)

            modifier = modifier.fillMaxHeight().padding(start = 4.dp),

            verticalAlignment = Alignment.CenterVertically,

            horizontalArrangement =

                Arrangement.spacedBy(dimensionResource(R.dimen.ongoing_activity_chip_margin_start)),

            horizontalArrangement = Arrangement.spacedBy(8.dp),

        ) {

            shownChips.forEach {

                key(it.key) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+3 −0
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ public class Clock extends TextView implements 


    private void reloadDimens() {

        FontSizeUtils.updateFontSize(this, R.dimen.status_bar_clock_size);



        // Note: The padding for the clock in the shade is controlled by ShadeHeaderController so

        // this just affects the status bar clock.

        setPaddingRelative(

                mContext.getResources().getDimensionPixelSize(

                        R.dimen.status_bar_clock_starting_padding),