From 39ff0382e2daf1ac3466b6e765dc3d8bc261b94d Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Wed, 19 Feb 2020 14:22:07 +0000
Subject: [PATCH] Set default float brightness constraint to invalid

The default setting is now invalid, so that if there is an overlay, it
is used and if not, the default int value is used.

Bug: b/149665432

Test: manual testing - ensure that the brightness value in
Settings>Display>Brightness Level can go the full range from 0% to 100%
(on a device without a float value in the overlay).

Change-Id: I52f3a66e33914bb91e05a6ae90f75d26dc002046
---
 core/res/res/values/config.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index c15b794266ccc..d956f31a0f1a4 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1278,20 +1278,21 @@
     <integer name="config_screenBrightnessSettingDefault">102</integer>
 
     <!-- Minimum screen brightness setting allowed by power manager.
-        The user is forbidden from setting the brightness below this level.
-        Equivalent to 10/255. -->
-    <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.035433073</item>
+         -2 is invalid so setting will resort to int value specified above.
+         Set this to 0.0 to allow screen to go to minimal brightness.
+         The user is forbidden from setting the brightness below this level. -->
+    <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">-2</item>
 
     <!-- Maximum screen brightness allowed by the power manager.
-         The user is forbidden from setting the brightness above this level.
-         This value is a fraction between 3.5% and 100%. -->
-    <item name="config_screenBrightnessSettingMaximumFloat" format="float" type="dimen">1.0</item>
+         -2 is invalid so setting will resort to int value specified above.
+         Set this to 1.0 for maximum brightness range.
+         The user is forbidden from setting the brightness above this level. -->
+    <item name="config_screenBrightnessSettingMaximumFloat" format="float" type="dimen">-2</item>
 
-    <!-- Default screen brightness setting.
-         Must be in the range specified by minimum and maximum.
-         This value is a fraction between 3.5% and 100%.
-         Equivalent to 102/255 (default for this device)    -->
-    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.397637795276</item>
+    <!-- Default screen brightness setting set.
+         -2 is invalid so setting will resort to int value specified above.
+         Must be in the range specified by minimum and maximum. -->
+    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">-2</item>
 
     <!-- Note: This setting is deprecated, please use
     config_screenBrightnessSettingForVrDefaultFloat instead -->