From 64d9b34509c7a51060a57200ba11d98840860bc5 Mon Sep 17 00:00:00 2001 From: Beverly Date: Mon, 21 Dec 2020 09:20:26 -0500 Subject: [PATCH] Disable FaceAuthScreenBrightnessController Temporary change so the ML team can create a baseline read on low-light performance without additional screen brightness ramping + additional scrims. Test: manual Bug: 175918367 Change-Id: I542d80c037cffc99a2abea3f44fdbd7d732a2f3d --- .../systemui/keyguard/FaceAuthScreenBrightnessController.kt | 6 ++++-- .../android/systemui/keyguard/dagger/KeyguardModule.java | 3 ++- .../keyguard/FaceAuthScreenBrightnessControllerTest.kt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt index a7d17e128ff32..b4137fa80f19f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessController.kt @@ -64,7 +64,8 @@ open class FaceAuthScreenBrightnessController( private val globalSettings: GlobalSettings, private val systemSettings: SystemSettings, private val mainHandler: Handler, - private val dumpManager: DumpManager + private val dumpManager: DumpManager, + private val enabled: Boolean ) : Dumpable { private var userDefinedBrightness: Float = 1f @@ -86,7 +87,7 @@ open class FaceAuthScreenBrightnessController( return } // TODO enable only when receiving a low-light error - overridingBrightness = running + overridingBrightness = if (enabled) running else false } } private lateinit var whiteOverlay: View @@ -188,6 +189,7 @@ open class FaceAuthScreenBrightnessController( println("brightnessAnimationDuration: $brightnessAnimationDuration") println("maxScreenBrightness: $maxScreenBrightness") println("userDefinedBrightness: $userDefinedBrightness") + println("enabled: $enabled") } } } \ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java index d7b5eea84c363..626abfcc85fde 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java @@ -142,8 +142,9 @@ public class KeyguardModule { return Optional.empty(); } + // currently disabled (doesn't ramp up brightness or use scrim) see b/175918367 return Optional.of(new FaceAuthScreenBrightnessController( notificationShadeWindowController, keyguardUpdateMonitor, resources, - globalSetting, systemSettings, handler, dumpManager)); + globalSetting, systemSettings, handler, dumpManager, false)); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt index 73a7ca93507d2..cb05a6b21b3a1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/FaceAuthScreenBrightnessControllerTest.kt @@ -83,7 +83,7 @@ class FaceAuthScreenBrightnessControllerTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) faceAuthScreenBrightnessController = object : FaceAuthScreenBrightnessController( notificationShadeWindowController, keyguardUpdateMonitor, resources, globalSettings, - systemSettings, mainHandler, dumpManager) { + systemSettings, mainHandler, dumpManager, true) { override fun createAnimator(start: Float, end: Float) = animator } `when`(systemSettings.getFloat(eq(SCREEN_BRIGHTNESS_FLOAT))).thenReturn(INITIAL_BRIGHTNESS)