From 4ac85f00836e501d81975fa9e9195656f09ed4da Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 30 Jul 2021 12:38:52 -0400
Subject: [PATCH] Unregister for prox when display isn't OFF/DOZE

Test: manual
Bug: 192699858
Change-Id: Ibd44e372e0171f2eb6129df448e6b66c5b923d02
---
 .../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 803765f..21b9084 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -31,6 +31,11 @@
     <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
     <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
 
+    <!-- Doze: only register sensors that use prox when device is in certain Display states. This
+     may delay registering sensors when device first shows dozing UI but the
+     Display & Power state hasn't changed to low-power mode yet. -->
+    <bool name="doze_selectively_register_prox">true</bool>
+
     <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
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 b848b8c..a5bb8e3 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -31,6 +31,11 @@
     <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
     <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
 
+    <!-- Doze: only register sensors that use prox when device is in certain Display states. This
+     may delay registering sensors when device first shows dozing UI but the
+     Display & Power state hasn't changed to low-power mode yet. -->
+    <bool name="doze_selectively_register_prox">true</bool>
+
     <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">