Merge Android 12 QPR1

Bug: 210511427
Merged-In: I09d5e0ae043b421216856e23644beca76ce54d44
Change-Id: I9ed009c36ef4c9fa50d2284e903fa365fc758ac6
This commit is contained in:
Xin Li
2021-12-13 21:36:44 -08:00

View File

@@ -31,13 +31,6 @@
always-on display) -->
<string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
<!-- Override value to use for proximity sensor. -->
<string name="proximity_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
<!-- If using proximity_sensor_type, specifies a threshold value to distinguish near and
far break points.-->
<item name="proximity_sensor_threshold" translatable="false" format="float" type="dimen">1</item>
<!-- Doze: can we assume the pickup sensor includes a proximity check? -->
<bool name="doze_pickup_performs_proximity_check">true</bool>