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

Unverified Commit 432b2d52 authored by Michael Bestas's avatar Michael Bestas
Browse files

fixup! SystemUI: Add auto brightness toggle in brightness slider in new compose QS 

* Match disabled state tint with the QS tiles and the brightness slider
* Move hardcoded content description to strings

Change-Id: I5381a1e18c58e1e67abdbd8ab5a76a7029375a79
parent 5d934cb5

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ 
    <string name="vpn_credentials_password">Password</string>

    <string name="vpn_credentials_dialog_connect">Connect</string>



    <!-- QS button to enable adaptive brightness -->

    <string name="accessibility_adaptive_brightness">Adaptive brightness</string>



    <!-- Name of the firewall status bar icon. -->

    <string name="status_bar_firewall">Firewall</string>

    <string name="status_bar_firewall_slot" translatable="false">firewall</string>

packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ private fun drawAutoBrightnessButton( 
        targetValue = if (autoMode) {

            MaterialTheme.colorScheme.primary

        } else {

            LocalAndroidColorScheme.current.surfaceEffect2

            LocalAndroidColorScheme.current.surfaceEffect1

        }

    )

    val iconTint by animateColorAsState(
@@ -470,7 +470,7 @@ private fun drawAutoBrightnessButton( 
    ) {

        Icon(

            painter = painterResource(painterRes),

            contentDescription = "Auto brightness",

            contentDescription = stringResource(R.string.accessibility_adaptive_brightness),

            tint = iconTint

        )

    }