From ab0dbdbc8685773169f9f490df6069cea7b6c232 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Fri, 1 Apr 2022 11:54:39 +0800
Subject: [PATCH] Fixed status bar glitch for apps that access internal
 resource dimen

Bring back old usage of status_bar_height, status_bar_height_portrait,
and status_bar_height_landscape by set the size containing cutout size.

Bug: 216782082
Test: make
Change-Id: I05142c120f05bdb5fa0543e61a6f50f46f6b0d82
---
 oriole/overlay/frameworks/base/core/res/res/values/config.xml | 4 +++-
 raven/overlay/frameworks/base/core/res/res/values/config.xml  | 4 +++-
 2 files changed, 6 insertions(+), 2 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 6eec9d0..574eed6 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -93,7 +93,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_height">74px</dimen>
+    <dimen name="status_bar_height_height_default">74px</dimen>
+    <dimen name="status_bar_height_portrait">124px</dimen>
+    <dimen name="status_bar_height_landscape">74px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
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 a83a4e4..8d422c3 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -198,7 +198,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">145px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>