summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-30 04:41:48 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-30 04:41:48 +0000
commit1482aa6ff89ec87f7e663af8fccf19c589b44ff3 (patch)
tree55ffc5230738d1dd14602849ddc49061a0205bc1
parent6a0de01522ef643ea7b3d5e62dc2b72cd55fd200 (diff)
parented341b029e86ea383dc03d06c009facc4b998206 (diff)
downloadraviole-1482aa6ff89ec87f7e663af8fccf19c589b44ff3.tar.gz
Merge cherrypicks of [15945985, 15945986, 15945987, 15945988, 15945989, 15945551, 15945552, 15945168, 15945990, 15945991, 15945575] into sc-d1-release
Change-Id: I1316466a05b9197e6bb45f15d5bb68d9623929cb
-rw-r--r--oriole/overlay/frameworks/base/core/res/res/values/config.xml3
-rw-r--r--raven/overlay/frameworks/base/core/res/res/values/config.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 4fcf00e3..267bc293 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -214,6 +214,9 @@
<!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
<integer name="config_fixedRefreshRateInHighZone">60</integer>
+ <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
+ <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
+
<!-- How long it takes for the HW to start illuminating after the illumination is requested.
It takes 3 frames to enable the Local High-Brightness Mode (LHBM), which at 90 Hz screen
refresh rate equates to a 34 ms delay. -->
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index c87a5329..ba283e6d 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -99,6 +99,9 @@
<!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
<integer name="config_defaultRefreshRateInZone">120</integer>
+ <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
+ <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
+
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0]