From b03fc73cf1840851c4990512cc273b248e039675 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 13 Aug 2021 15:35:21 -0400
Subject: [PATCH] Add config for brightness sensor using prox

Binned brightness sensor on R4O6 don't use the
prox sensor.

Test: manual
Bug: 194151347
Change-Id: I339a4a4612c7eb5f90196835ef9121b114cdece3
---
 .../frameworks/base/packages/SystemUI/res/values/config.xml  | 5 +++++
 .../frameworks/base/packages/SystemUI/res/values/config.xml  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 21b9084..6f9b86e 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -25,6 +25,11 @@
          always-on display) -->
     <string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
 
+    <!-- Doze: whether the brightness sensor uses the proximity sensor.
+         If both this parameter and doze_selectively_register_prox are true, registration for the
+         brightness sensor won't occur when the display state is ON. -->
+    <bool name="doze_brightness_uses_prox">false</bool>
+
     <!-- Doze: can we assume the pickup sensor includes a proximity check? -->
     <bool name="doze_pickup_performs_proximity_check">true</bool>
 
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index a5bb8e3..1273f27 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -25,6 +25,11 @@
          always-on display) -->
     <string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
 
+    <!-- Doze: whether the brightness sensor uses the proximity sensor.
+         If both this parameter and doze_selectively_register_prox are true, registration for the
+         brightness sensor won't occur when the display state is ON. -->
+    <bool name="doze_brightness_uses_prox">false</bool>
+
     <!-- Doze: can we assume the pickup sensor includes a proximity check? -->
     <bool name="doze_pickup_performs_proximity_check">true</bool>