Merge "[Catalyst] Rollback the Adaptive brightness key" into main

2025-01-17 06:31:32 -08:00
parent 68178f684e 03de6af4fc
commit 07eca37281
3 changed files with 29 additions and 9 deletions
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessScreenTest.kt
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessScreenTest.kt
@@ -128,7 +128,11 @@ class AutoBrightnessScreenTest {
        }

    private fun setScreenBrightnessMode(value: Int) =
-        Settings.System.putInt(context.contentResolver, AutoBrightnessScreen.KEY, value)
+        Settings.System.putInt(
+            context.contentResolver,
+            Settings.System.SCREEN_BRIGHTNESS_MODE,
+            value,
+        )

    private fun getResId() =
        when {