From 050cd4fd693daa326641d396b00e5b6e90d362d6 Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Tue, 20 Aug 2024 03:48:54 +0000
Subject: [PATCH] Set a proper status bar height

Bug: 360052539
Test: make and boot
Flag: EXEMPT bugfix

Change-Id: Ibf6b5f5e2ea3fa81ce5650fa0d9a6d884d6ef3cd
---
 .../frameworks/base/core/res/res/values/config.xml  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config.xml b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
index b8e8e55f..46eb1061 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
@@ -173,9 +173,12 @@
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
 
-    <dimen name="status_bar_height_default">52dp</dimen>
-    <dimen name="status_bar_height_portrait">52dp</dimen>
-    <dimen name="status_bar_height_landscape">52dp</dimen>
+    <!-- Align to camera cutout's height. -->
+    <dimen name="status_bar_height_portrait">68dp</dimen>
+    <!-- Since @dimen/status_bar_height_portrait is modified in overlay, need to restore its value
+         from original folder. This should be done even looks no effect on some apps because
+         some other apps may reference to it. -->
+    <dimen name="status_bar_height_landscape">24dp</dimen>
 
     <!-- Whether the display cutout region of the main built-in display should be forced to
         black in software (to avoid aliasing or emulate a cutout that is not physically existent).
@@ -187,8 +190,10 @@
         @left
     </string>
 
+    <!-- This configuartion effects status bar's height actually. Set its height as double
+         y position of @dimen/config_mainBuiltInDisplayCutout to make cutout center vertically -->
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        m 586,0 h 108.5 v 155.5 H 586 Z
+        m 586,0 h 108.5 v 204 H 586 Z
         @left
     </string>
     <!-- A string config in svg path format for the main display shape.