diff options
| author | 2025-02-25 12:16:00 -0800 | |
|---|---|---|
| committer | 2025-02-25 12:16:00 -0800 | |
| commit | 0a3f7fd7ed3877cd777da14367ea74afadfee556 (patch) | |
| tree | f02ab154b7b25b534fedf9b43dde5c783a27a32a | |
| parent | 19258700faa0be87a2731a7e43addb08b25a1d36 (diff) | |
| parent | 8c2e86955018d7672f9bfa51db961765e1fbc847 (diff) | |
Merge "[shade] add an id to the battery composable" into main
| -rw-r--r-- | packages/SystemUI/res/values/ids.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 47a9bd638088..2d0f0f988341 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -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> diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt index ce48c85d57ae..6670c04d7f8f 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt @@ -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(), |