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

Commit 4304e256 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Battery] Protect against UnifiedBattery using too-big insets. 

`inset` will inset the drawing space on both sides, which means that if
you inset by more than half of the available space, there's negative
room available and Compose will throw an exception.

Protect against that by never asking for an inset of more than half.

Bug: 400246091
Flag: com.android.settingslib.flags.new_status_bar_icons
Test: battery icon still renders correctly
Change-Id: Idcc41e19fe2268418c7f7bdc83acc2fe8aa71e04
parent bc85e45d

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt

+7 −1
Original line number Diff line number Diff line
@@ -101,7 +101,13 @@ fun BatteryCanvas( 
            for (glyph in glyphs) {

                // Move the glyph to the right spot

                val verticalOffset = (BatteryFrame.innerHeight - glyph.height) / 2

                inset(horizontalOffset, verticalOffset) { glyph.draw(this, colors) }

                inset(

                    // Never try and inset more than half of the available size - see b/400246091.

                    minOf(horizontalOffset, size.width / 2),

                    minOf(verticalOffset, size.height / 2),

                ) {

                    glyph.draw(this, colors)

                }



                horizontalOffset += glyph.width + INTER_GLYPH_PADDING_PX

            }