From f94b4648325087cff2bc9acdf4d89653d9a19561 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Fri, 8 Apr 2022 11:45:00 +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: Iff388639497a7955e363c3372d79ead35831bea5
---
 .../overlay/frameworks/base/core/res/res/values/dimens.xml    | 4 +++-
 .../overlay/frameworks/base/core/res/res/values/dimens.xml    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 fb5ea14..ee3f9c7 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -29,7 +29,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">130px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
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 82c194e..9051ca3 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -29,7 +29,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">118px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>