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

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

Merge "[shade] add stacked_mobile to the list of hidden icons" into main

parents 0fd05e10 2d6c5198

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+5 −6
Original line number Diff line number Diff line
@@ -293,11 +293,7 @@ fun ContentScope.OverlayShadeHeader( 
    viewModel: ShadeHeaderViewModel,

    modifier: Modifier = Modifier,

) {

    OverlayShadeHeaderPartialStateless(

        viewModel,

        viewModel.showClock,

        modifier,

    )

    OverlayShadeHeaderPartialStateless(viewModel, viewModel.showClock, modifier)

}



/**
@@ -634,7 +630,10 @@ private fun ContentScope.StatusIcons( 
        Utils.getColorAttrDefaultColor(themedContext, android.R.attr.textColorPrimaryInverse)



    val carrierIconSlots =

        listOf(stringResource(id = com.android.internal.R.string.status_bar_mobile))

        listOf(

            stringResource(id = com.android.internal.R.string.status_bar_mobile),

            stringResource(id = com.android.internal.R.string.status_bar_stacked_mobile),

        )

    val cameraSlot = stringResource(id = com.android.internal.R.string.status_bar_camera)

    val micSlot = stringResource(id = com.android.internal.R.string.status_bar_microphone)

    val locationSlot = stringResource(id = com.android.internal.R.string.status_bar_location)

packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt

+4 −1
Original line number Diff line number Diff line
@@ -381,7 +381,10 @@ constructor( 
        }



        carrierIconSlots =

            listOf(header.context.getString(com.android.internal.R.string.status_bar_mobile))

            listOf(

                header.context.getString(com.android.internal.R.string.status_bar_mobile),

                header.context.getString(com.android.internal.R.string.status_bar_stacked_mobile),

            )

        mShadeCarrierGroupController =

            shadeCarrierGroupControllerBuilder.setShadeCarrierGroup(mShadeCarrierGroup).build()

packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -216,7 +216,10 @@ class ShadeHeaderControllerTest : SysuiTestCase() { 
        whenever(view.isAttachedToWindow).thenReturn(true)

        shadeHeaderController.init()

        carrierIconSlots =

            listOf(context.getString(com.android.internal.R.string.status_bar_mobile))

            listOf(

                context.getString(com.android.internal.R.string.status_bar_mobile),

                context.getString(com.android.internal.R.string.status_bar_stacked_mobile),

            )

    }



    @Test