From a9187a3fae4e4f98dc9b49aad0eaaea20b06fcbe Mon Sep 17 00:00:00 2001
From: Shawn Lin <shawnlin@google.com>
Date: Mon, 17 Oct 2022 17:20:38 +0800
Subject: [PATCH] Update status bar height to center the hole punch cutout

Bug: 253071694
Test: make
Change-Id: I6baa011224ea366821d4c665bb19da0842106ace
---
 cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml | 2 +-
 panther/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 panther/overlay/frameworks/base/core/res/res/values/dimens.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index 8fb9fd2..bc57313 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -61,7 +61,7 @@
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
         M 653,0
         h 145
-        v 130
+        v 144
         h -145
         Z
         @left
diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
index ee3f9c7..c99f6cc 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -30,7 +30,7 @@
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
     <dimen name="status_bar_height_default">28dp</dimen>
-    <dimen name="status_bar_height_portrait">130px</dimen>
+    <dimen name="status_bar_height_portrait">144px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index 9369361..30a508b 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -60,7 +60,7 @@
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
         M 480,0
         h 145
-        v 118
+        v 136
         h -145
         Z
         @left
diff --git a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
index 9051ca3..a388c76 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -30,7 +30,7 @@
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
     <dimen name="status_bar_height_default">28dp</dimen>
-    <dimen name="status_bar_height_portrait">118px</dimen>
+    <dimen name="status_bar_height_portrait">136px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->