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

Commit f0683aa8 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong brightnessOverriddenByWindow state in BrightnessSlider" into main

parents 3802103d 0e58a30b

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

+4 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import androidx.compose.runtime.DisposableEffect 
import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableIntStateOf

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.rememberCoroutineScope

import androidx.compose.runtime.setValue
@@ -105,11 +106,11 @@ private fun BrightnessSlider( 
            null

        }



    val overriddenByAppState =

    val overriddenByAppState by

        if (Flags.showToastWhenAppControlBrightness()) {

            viewModel.brightnessOverriddenByWindow.collectAsStateWithLifecycle().value

            viewModel.brightnessOverriddenByWindow.collectAsStateWithLifecycle()

        } else {

            false

            remember { mutableStateOf(false) }

        }



    PlatformSlider(