From 5d9a0fe216a83b4142bafc77fd9a3306234790ae Mon Sep 17 00:00:00 2001
From: Mukul Dhir <dhirmukul3@gmail.com>
Date: Tue, 13 Aug 2024 14:42:54 -0400
Subject: [PATCH] dubai: overlay: Redo statusbar padding overlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Prior to this, the icons were not aligned to the camera cutout.
• Seems like motorola had set status_bar_padding_top_portrait but
  we don't have that. However, status_bar_padding_top is configurable
  so use the same value there.

Change-Id: Ife06be11a66098c8e84a94b1f11efd2c2280b9f3
---
 .../dubai/Frameworks/res/values-land/dimens.xml  | 11 -----------
 .../dubai/Frameworks/res/values/dimens.xml       | 16 ++++++++++++++--
 .../dubai/SystemUI/res/values/dimens.xml         |  6 ++++++
 3 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 resource-overlay/dubai/Frameworks/res/values-land/dimens.xml

diff --git a/resource-overlay/dubai/Frameworks/res/values-land/dimens.xml b/resource-overlay/dubai/Frameworks/res/values-land/dimens.xml
deleted file mode 100644
index 8b2feaa..0000000
--- a/resource-overlay/dubai/Frameworks/res/values-land/dimens.xml
+++ /dev/null
@@ -1,11 +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 in landscape. The height should be
-         Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height">24.0dip</dimen>
-</resources>
diff --git a/resource-overlay/dubai/Frameworks/res/values/dimens.xml b/resource-overlay/dubai/Frameworks/res/values/dimens.xml
index 1220bff..d42b87d 100644
--- a/resource-overlay/dubai/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/dubai/Frameworks/res/values/dimens.xml
@@ -10,9 +10,21 @@
     <!-- Default paddings for content around the corners. -->
     <dimen name="rounded_corner_content_padding">4px</dimen>
 
+    <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
+         calculate the status bar height. -->
+    <dimen name="status_bar_height_default">105px</dimen>
+
     <!-- Height of the status bar in portrait. The height should be
          Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_portrait">105.0px</dimen>
+    <dimen name="status_bar_height_portrait">@dimen/status_bar_height_default</dimen>
 
-    <dimen name="status_bar_padding_top_portrait">20.0px</dimen>
+    <!-- Height of the status bar in landscape.
+         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+         -->
+    <dimen name="status_bar_height_landscape">14dip</dimen>
+
+    <!-- Height of area above QQS where battery/time go.
+         Do not read this dimen directly. Use {@link SystemBarUtils#getQuickQsOffsetHeight} instead.
+         -->
+    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_default</dimen>
 </resources>
diff --git a/resource-overlay/dubai/SystemUI/res/values/dimens.xml b/resource-overlay/dubai/SystemUI/res/values/dimens.xml
index 84e50e6..55b4824 100644
--- a/resource-overlay/dubai/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/dubai/SystemUI/res/values/dimens.xml
@@ -7,6 +7,12 @@
     <!-- the padding on the start of the statusbar -->
     <dimen name="status_bar_padding_start">20.0dip</dimen>
 
+    <!-- The padding on the end of the statusbar -->
+    <dimen name="status_bar_padding_end">7.0dip</dimen>
+
+    <!-- The padding on the top of the statusbar (usually 0) -->
+    <dimen name="status_bar_padding_top">20.0px</dimen>
+
     <!-- Height of the status bar header bar when on Keyguard -->
     <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>