From 6321ae0241820b817ef12c8b92ef8813b2a22bf8 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Fri, 1 Apr 2022 11:46:52 +0800
Subject: [PATCH] lemonadep: 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: I0bf97352bc07e45d7694f9512266f08e7139c103
---
 .../res/values-land/dimens.xml                      | 13 -------------
 .../OPlusFrameworksResTarget/res/values/dimens.xml  |  4 +++-
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 overlay/OPlusFrameworksResTarget/res/values-land/dimens.xml

diff --git a/overlay/OPlusFrameworksResTarget/res/values-land/dimens.xml b/overlay/OPlusFrameworksResTarget/res/values-land/dimens.xml
deleted file mode 100644
index 4c38fdc..0000000
--- a/overlay/OPlusFrameworksResTarget/res/values-land/dimens.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-
-    <!-- Height of the status bar.
-         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-         -->
-    <dimen name="status_bar_height">28dp</dimen>
-
-</resources>
diff --git a/overlay/OPlusFrameworksResTarget/res/values/dimens.xml b/overlay/OPlusFrameworksResTarget/res/values/dimens.xml
index 65674e0..da960eb 100644
--- a/overlay/OPlusFrameworksResTarget/res/values/dimens.xml
+++ b/overlay/OPlusFrameworksResTarget/res/values/dimens.xml
@@ -8,7 +8,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height">152px</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">152px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Default radius of the software rounded corners. -->
     <dimen name="rounded_corner_radius">8dp</dimen>