Merge "Clean up show_toast_when_app_control_brightness flag" into main (c5a3029f) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1603,16 +1603,6 @@ flag {
		}
		}

		flag {
		name: "show_toast_when_app_control_brightness"
		namespace: "systemui"
		description: "Showing the warning toast if the current running app window has controlled the brightness value."
		bug: "363225340"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "home_controls_dream_hsum"
		namespace: "systemui"

+11 −9

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.settings.brightness
		import android.hardware.display.BrightnessInfo
		import android.hardware.display.DisplayManager
		import android.os.Handler
		import android.platform.test.annotations.RequiresFlagsEnabled
		import android.platform.test.flag.junit.CheckFlagsRule
		import android.platform.test.flag.junit.DeviceFlagsValueProvider
		import android.service.vr.IVrManager
		@@ -28,7 +27,6 @@ import android.testing.TestableLooper.RunWithLooper
		import android.view.Display
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.settings.DisplayTracker
		@@ -120,13 +118,17 @@ class BrightnessControllerTest : SysuiTestCase() {
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_SHOW_TOAST_WHEN_APP_CONTROL_BRIGHTNESS)
		fun testOnChange_showToastWhenAppOverridesBrightness() {
		val brightnessInfo = BrightnessInfo(
		0.45f, 0.45f, 0.0f, 1.0f, BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF,
		val brightnessInfo =
		BrightnessInfo(
		0.45f,
		0.45f,
		0.0f,
		1.0f,
		BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF,
		1.0f /* highBrightnessTransitionPoint */,
		BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE,
		true /* isBrightnessOverrideByWindow */
		true, /* isBrightnessOverrideByWindow */
		)
		whenever(display.brightnessInfo).thenReturn(brightnessInfo)
		underTest.registerCallbacks()

+5 −12

Original line number	Diff line number	Diff line
		@@ -317,7 +317,6 @@ fun BrightnessSlider(
		val currentShowToast by rememberUpdatedState(showToast)
		// Showing the warning toast if the current running app window has controlled the
		// brightness value.
		if (Flags.showToastWhenAppControlBrightness()) {
		LaunchedEffect(interactionSource, overriddenByAppState) {
		interactionSource.interactions.collect { interaction ->
		if (interaction is DragInteraction.Start && overriddenByAppState) {
		@@ -326,7 +325,6 @@ fun BrightnessSlider(
		}
		}
		}
		}

		private fun Modifier.sliderBackground(color: Color) = drawWithCache {
		val offsetAround = SliderBackgroundFrameSize.toSize()
		@@ -354,12 +352,7 @@ fun BrightnessSliderContainer(
		viewModel.policyRestriction.collectAsStateWithLifecycle(
		initialValue = PolicyRestriction.NoRestriction
		)
		val overriddenByAppState by
		if (Flags.showToastWhenAppControlBrightness()) {
		viewModel.brightnessOverriddenByWindow.collectAsStateWithLifecycle()
		} else {
		remember { mutableStateOf(false) }
		}
		val overriddenByAppState by viewModel.brightnessOverriddenByWindow.collectAsStateWithLifecycle()

		DisposableEffect(Unit) { onDispose { viewModel.setIsDragging(false) } }

+5 −8

Original line number	Diff line number	Diff line
		@@ -363,16 +363,13 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
		boolean starting = !mTrackingTouch && tracking;
		mTrackingTouch = tracking;
		if (starting) {
		if (Flags.showToastWhenAppControlBrightness()) {
		// Showing the warning toast if the current running app window has
		// controlled the brightness value.
		if (mIsBrightnessOverriddenByWindow) {
		mControl.showToast(R.string.quick_settings_brightness_unable_adjust_msg);
		}
		}
		}
		if (mExternalChange
		\|\| (Flags.showToastWhenAppControlBrightness() && mIsBrightnessOverriddenByWindow)) {
		if (mExternalChange \|\| mIsBrightnessOverriddenByWindow) {
		return;
		}