From 4e8cf7bb83856e68625f5c9b354cb069b2e4a92b Mon Sep 17 00:00:00 2001
From: Ken Lin <lyenting@google.com>
Date: Wed, 13 Mar 2024 16:14:42 +0000
Subject: [PATCH 1/6] display: tk4: don't apply overlay in low light

Bug: 320729940
Test: trigger AOD night mode
Change-Id: Icf6c02c2c98fd252721dc835dbc265851bfa882f
Signed-off-by: Ken Lin <lyenting@google.com>
---
 .../frameworks/base/packages/SystemUI/res/values/config.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index f91150bf..4ef5dd2e 100644
--- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -29,7 +29,7 @@
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
         <item>-1</item> <!-- 0: OFF -->
-        <item>2</item> <!-- 1: NIGHT -->
+        <item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(1800-2)+2 = 2 nits -->
         <item>2</item> <!-- 2: LOW (2-1)/(255-1)*(1800-2)+2 = 9.08 nits -->
         <item>8</item> <!-- 3: HIGH (8-1)/(255-1)*(1800-2)+2 = 51.55 nits -->
         <item>8</item> <!-- 4: SUN -->
@@ -41,7 +41,7 @@
                -1 means keeping the current opacity. -->
     <integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
         <item>-1</item> <!-- 0: OFF -->
-        <item>133</item> <!-- 1: NIGHT -->
+        <item>0</item> <!-- 1: NIGHT -->
         <item>0</item> <!-- 2: LOW -->
         <item>0</item> <!-- 3: HIGH -->
         <item>0</item> <!-- 4: SUN -->

From f981fa4f816c28f3d641e2be33cbb0daa7db1ba5 Mon Sep 17 00:00:00 2001
From: Yvonne Yip <ykyyip@google.com>
Date: Fri, 15 Mar 2024 16:26:29 -0700
Subject: [PATCH 2/6] powerhint: revert dvfs_headroom settings for camera

Bug: 329905546
Test: boot
Change-Id: Ieb0869ab6e57a163ead89469f426be2d3e2f76a8
Merged-In: Ieb0869ab6e57a163ead89469f426be2d3e2f76a8
---
 perf/powerhint-caiman.json        | 26 ++++++++++++++++----------
 perf/powerhint-komodo.json        | 26 ++++++++++++++++----------
 perf/powerhint-ripcurrentpro.json | 26 ++++++++++++++++----------
 perf/powerhint-tokay.json         | 26 ++++++++++++++++----------
 4 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 33461c7d..a2c9444d 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -220,7 +220,7 @@
         "2048 1280 1280",
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -231,7 +231,7 @@
       "Values": [
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1280 1100 1055"
       ],
       "DefaultIndex": 1,
       "ResetOnInit": true
@@ -1854,13 +1854,13 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1934,12 +1934,6 @@
       "Duration": 0,
       "Value": "700000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUDVFSHeadroom",
-      "Duration": 0,
-      "Value": "1280"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2012,6 +2006,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 33461c7d..a2c9444d 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -220,7 +220,7 @@
         "2048 1280 1280",
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -231,7 +231,7 @@
       "Values": [
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1280 1100 1055"
       ],
       "DefaultIndex": 1,
       "ResetOnInit": true
@@ -1854,13 +1854,13 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1934,12 +1934,6 @@
       "Duration": 0,
       "Value": "700000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUDVFSHeadroom",
-      "Duration": 0,
-      "Value": "1280"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2012,6 +2006,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 33461c7d..a2c9444d 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -220,7 +220,7 @@
         "2048 1280 1280",
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -231,7 +231,7 @@
       "Values": [
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1280 1100 1055"
       ],
       "DefaultIndex": 1,
       "ResetOnInit": true
@@ -1854,13 +1854,13 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1934,12 +1934,6 @@
       "Duration": 0,
       "Value": "700000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUDVFSHeadroom",
-      "Duration": 0,
-      "Value": "1280"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2012,6 +2006,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 33461c7d..a2c9444d 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -220,7 +220,7 @@
         "2048 1280 1280",
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1100 1024 1100"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -231,7 +231,7 @@
       "Values": [
         "1280",
         "1100",
-        "1100 1078 1024"
+        "1280 1100 1055"
       ],
       "DefaultIndex": 1,
       "ResetOnInit": true
@@ -1854,13 +1854,13 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
-      "Value": "1100 1078 1024"
+      "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1934,12 +1934,6 @@
       "Duration": 0,
       "Value": "700000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUDVFSHeadroom",
-      "Duration": 0,
-      "Value": "1280"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2012,6 +2006,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280 1100 1055"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",

From 816bc81f42cd671ecf74f6fc34381fcebfba0990 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Mon, 18 Mar 2024 03:29:20 +0000
Subject: [PATCH 3/6] caimito: remove useless argument of speaker.

note:
     Rotation is uses for tablet project only.

Test: build pass.
Bug: 330083943
Change-Id: I9ecc8d73b282c1aab15b90813c35376e54a4bdf0
---
 audio/caiman/aidl_config/audio_platform_configuration.xml | 1 -
 audio/komodo/aidl_config/audio_platform_configuration.xml | 1 -
 audio/tokay/aidl_config/audio_platform_configuration.xml  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml
index 8eb240a7..a662976d 100644
--- a/audio/caiman/aidl_config/audio_platform_configuration.xml
+++ b/audio/caiman/aidl_config/audio_platform_configuration.xml
@@ -50,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml
index 8eb240a7..a662976d 100644
--- a/audio/komodo/aidl_config/audio_platform_configuration.xml
+++ b/audio/komodo/aidl_config/audio_platform_configuration.xml
@@ -50,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml
index 8eb240a7..a662976d 100644
--- a/audio/tokay/aidl_config/audio_platform_configuration.xml
+++ b/audio/tokay/aidl_config/audio_platform_configuration.xml
@@ -50,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>

From 517aca891b56457d7f3beb4dc04ae14334e7ba37 Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Thu, 29 Feb 2024 07:54:52 +0000
Subject: [PATCH 4/6] Use rounded corner radius from max resolution

Bug: 330088446
Test: try WindowInsets#getRoundedCorner
Flag: NONE
Change-Id: I70be19a730ff6d29b7eb18f27c26d217ae1727c4
---
 .../overlay/frameworks/base/core/res/res/values/dimens.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml b/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9af98fed..3a05753e 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">157px</dimen>
+    <dimen name="rounded_corner_radius_top">157px</dimen>
+    <dimen name="rounded_corner_radius_bottom">157px</dimen>
 </resources>

From 664e173186b1144051d1704c21636115f312fcf2 Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Mon, 4 Mar 2024 05:08:21 +0000
Subject: [PATCH 5/6] Use rounded corner radius from max resolution

Bug: 330088446
Test: try WindowInsets#getRoundedCorner
Flag: NONE
Change-Id: I833f8d8d07a64810bc9437a4696d9690d9f900a1
---
 .../overlay/frameworks/base/core/res/res/values/dimens.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml b/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9af98fed..ddb2caf5 100644
--- a/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/komodo/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">153px</dimen>
+    <dimen name="rounded_corner_radius_top">153px</dimen>
+    <dimen name="rounded_corner_radius_bottom">153px</dimen>
 </resources>

From 4554ae382bb916cd5a4398fba3f8574be572a981 Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Mon, 4 Mar 2024 05:10:06 +0000
Subject: [PATCH 6/6] Use rounded corner radius from max resolution

Bug: 330088446
Test: try WindowInsets#getRoundedCorner
Flag: NONE
Change-Id: Ia600acc9efef7370627efbd704dd6d5196e49448
---
 .../overlay/frameworks/base/core/res/res/values/dimens.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml b/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9af98fed..c498bcdc 100644
--- a/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -19,7 +19,7 @@
 
 <resources>
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">115px</dimen>
-    <dimen name="rounded_corner_radius_top">118px</dimen>
-    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+    <dimen name="rounded_corner_radius">132px</dimen>
+    <dimen name="rounded_corner_radius_top">132px</dimen>
+    <dimen name="rounded_corner_radius_bottom">132px</dimen>
 </resources>