Merge changes I7d1e4018,Ib667b1fd into 24D1-dev am: ac841c5fd0

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/26519328

Change-Id: I4ef0ebf3a4df7c1fc7daa3e93bac84521a6fae60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeremy DeHaan 2024-03-14 23:13:08 +00:00 committed by Automerger Merge Worker
commit ee20592b04
2 changed files with 8 additions and 8 deletions

View file

@ -43,10 +43,10 @@
to brightness values; -1 means keeping the current brightness. --> to brightness values; -1 means keeping the current brightness. -->
<integer-array name="config_doze_brightness_sensor_to_brightness"> <integer-array name="config_doze_brightness_sensor_to_brightness">
<item>-1</item> <!-- 0: OFF --> <item>-1</item> <!-- 0: OFF -->
<item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(1850-2)+2 = 2 nits --> <item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(2050-2)+2 = 2 nits -->
<item>2</item> <!-- 2: LOW (2-1)/(255-1)*(1850-2)+2 = 9.2 nits --> <item>2</item> <!-- 2: LOW (2-1)/(255-1)*(2050-2)+2 = 10.1 nits -->
<item>8</item> <!-- 3: HIGH (8-1)/(255-1)*(1850-2)+2 = 52.9 nits --> <item>7</item> <!-- 3: HIGH (7-1)/(255-1)*(2050-2)+2 = 50.4 nits -->
<item>8</item> <!-- 4: SUN --> <item>7</item> <!-- 4: SUN -->
</integer-array> </integer-array>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor

View file

@ -43,10 +43,10 @@
to brightness values; -1 means keeping the current brightness. --> to brightness values; -1 means keeping the current brightness. -->
<integer-array name="config_doze_brightness_sensor_to_brightness"> <integer-array name="config_doze_brightness_sensor_to_brightness">
<item>-1</item> <!-- 0: OFF --> <item>-1</item> <!-- 0: OFF -->
<item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(1850-2)+2 = 2 nits --> <item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(2050-2)+2 = 2 nits -->
<item>2</item> <!-- 2: LOW (2-1)/(255-1)*(1850-2)+2 = 9.2 nits --> <item>2</item> <!-- 2: LOW (2-1)/(255-1)*(2050-2)+2 = 10.1 nits -->
<item>8</item> <!-- 3: HIGH (8-1)/(255-1)*(1850-2)+2 = 52.9 nits --> <item>7</item> <!-- 3: HIGH (7-1)/(255-1)*(2050-2)+2 = 50.4 nits -->
<item>8</item> <!-- 4: SUN --> <item>7</item> <!-- 4: SUN -->
</integer-array> </integer-array>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor