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

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

Merge "[shade] add an id to the battery composable" into main

parents 19258700 8c2e8695

packages/SystemUI/res/values/ids.xml

+3 −0
Original line number Diff line number Diff line
@@ -294,4 +294,7 @@ 
    <item type="id" name="brightness_dialog_slider" />



    <item type="id" name="aod_promoted_notification_view_updater_tag" />



    <!-- id for the composable battery meter (see UnifiedBattery.kt) -->

    <item type="id" name="battery_meter_composable_view" />

</resources>

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

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ constructor( 
            val batteryComposeView =

                ComposeView(mView.context).apply {

                    setContent {

                        id = R.id.battery_meter_composable_view

                        val showBatteryEstimate by showBatteryEstimate.collectAsStateWithLifecycle()

                        BatteryWithEstimate(

                            modifier = Modifier.height(17.dp).wrapContentWidth(),