Commit 0e58a30b authored Nov 21, 2024 by Ming-Shin Lu

Fix wrong brightnessOverriddenByWindow state in BrightnessSlider

In case brightnessOverriddenByWindow state may lost when switching apps
then scrolling down QuickSettingsPanel to trigger BrightnessSlider
recomposition.

Use State.value directly to ensure getting up-to-date state.

Flag: com.android.systemui.check_lockscreen_gone_transition
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Bug: 363225340
Test: manual
  1) enable com.android.systemui.qs_ui_refactor_compose_fragment flag
  2) launch NetFlix app
  3) scroll down the QuickSettingsPanel
  4) Swipe the brightness slider
  5) verify BrightnessWarningToast will show up expectedly
Test: atest -d PlatformScenarioTests:SwipeBrightnessShowToast when
  enabling com.android.systemui.qs_ui_refactor_compose_fragment flag
Change-Id: I2610e652f2f216c20d52db8ef9ae80ba11974d13

parent 9b4fcde9

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -32,6 +32,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
		@@ -103,11 +104,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(