From fb5580856f76fba28f95471bc35688cea7b583cb Mon Sep 17 00:00:00 2001
From: wildbeetle <172128642+wildbeetle@users.noreply.github.com>
Date: Wed, 3 Jul 2024 22:48:15 +0700
Subject: [PATCH] Clean up and reorder Redmi 9 overlays.

Changeset:
* Fix status bar padding. Fixes phhusson/treble_experimentations#2631
* Set keyguard_carrier_text_margin
* Cleanup power_profile.xml
* Set quick_qs_offset_height to height of the cutout.
* Reorder based on https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/res/res/values/config.xml https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/res/res/values/dimens.xml https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/packages/SystemUI/res/values/dimens.xml
---
 Xiaomi/Redmi9-SystemUI/res/values/dimens.xml         |  6 ++++--
 Xiaomi/Redmi9/res/values/bools.xml                   |  7 -------
 Xiaomi/Redmi9/res/values/{strings.xml => config.xml} |  4 ++++
 Xiaomi/Redmi9/res/values/dimens.xml                  | 12 ++++++------
 Xiaomi/Redmi9/res/xml/power_profile.xml              |  3 ++-
 5 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 Xiaomi/Redmi9/res/values/bools.xml
 rename Xiaomi/Redmi9/res/values/{strings.xml => config.xml} (63%)

diff --git a/Xiaomi/Redmi9-SystemUI/res/values/dimens.xml b/Xiaomi/Redmi9-SystemUI/res/values/dimens.xml
index 3b95a0d50..d602638f7 100644
--- a/Xiaomi/Redmi9-SystemUI/res/values/dimens.xml
+++ b/Xiaomi/Redmi9-SystemUI/res/values/dimens.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="navigation_side_padding">85.0dip</dimen>
-    <dimen name="rounded_corner_content_padding">7.0dip</dimen>
+    <dimen name="status_bar_padding_start">19.0dip</dimen>
+    <dimen name="status_bar_padding_end">4.0dip</dimen>
     <dimen name="status_bar_padding_top">7.0dip</dimen>
+    <dimen name="navigation_side_padding">85.0dip</dimen>
+    <dimen name="keyguard_carrier_text_margin">28.0dip</dimen>
 </resources>
diff --git a/Xiaomi/Redmi9/res/values/bools.xml b/Xiaomi/Redmi9/res/values/bools.xml
deleted file mode 100644
index 6c28cd68b..000000000
--- a/Xiaomi/Redmi9/res/values/bools.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="config_dozeAfterScreenOffByDefault">true</bool>
-    <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool>
-    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
-    <bool name="config_useDevInputEventForAudioJack">true</bool>
-</resources>
diff --git a/Xiaomi/Redmi9/res/values/strings.xml b/Xiaomi/Redmi9/res/values/config.xml
similarity index 63%
rename from Xiaomi/Redmi9/res/values/strings.xml
rename to Xiaomi/Redmi9/res/values/config.xml
index b8fbeedcf..9df20c079 100644
--- a/Xiaomi/Redmi9/res/values/strings.xml
+++ b/Xiaomi/Redmi9/res/values/config.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <bool name="config_dozeAfterScreenOffByDefault">true</bool>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool>
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
     <string name="config_mainBuiltInDisplayCutout">M84.0014003,76.0002722 C39.8036856,75.9997279 11.8039716,75.9996372 0.00225823708,76 C-11.8004588,76.0003629 -39.8012115,76.0004536 -84,76.0002722 L-84,-4.19220214e-13 L84.0014003,-4.19220214e-13 L84.0014003,76.0002722 Z</string>
     <string name="config_mainBuiltInDisplayCutoutRectApproximation">@string/config_mainBuiltInDisplayCutout</string>
+    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
 </resources>
diff --git a/Xiaomi/Redmi9/res/values/dimens.xml b/Xiaomi/Redmi9/res/values/dimens.xml
index 9b9a50aa8..c2b100c80 100644
--- a/Xiaomi/Redmi9/res/values/dimens.xml
+++ b/Xiaomi/Redmi9/res/values/dimens.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="status_bar_height_default">27.636353dip</dimen>
+    <item type="dimen" name="status_bar_height">@dimen/status_bar_height_portrait</item>
+    <dimen name="status_bar_height_portrait">27.636353dip</dimen>
+    <item type="dimen" name="status_bar_height_landscape">@dimen/status_bar_height_portrait</item>
+    <dimen name="quick_qs_offset_height">27.636353dip</dimen>
     <dimen name="navigation_bar_height">47.19998dip</dimen>
     <dimen name="navigation_bar_height_landscape">47.19998dip</dimen>
     <dimen name="navigation_bar_width">47.19998dip</dimen>
-    <dimen name="quick_qs_offset_height">48.0dip</dimen>
     <dimen name="rounded_corner_radius">20.0dip</dimen>
-    <dimen name="rounded_corner_radius_bottom">90.0px</dimen>
     <dimen name="rounded_corner_radius_top">95.0px</dimen>
-    <item type="dimen" name="status_bar_height">@dimen/status_bar_height_portrait</item>
-    <dimen name="status_bar_height_default">27.636353dip</dimen>
-    <item type="dimen" name="status_bar_height_landscape">@dimen/status_bar_height_portrait</item>
-    <dimen name="status_bar_height_portrait">27.636353dip</dimen>
+    <dimen name="rounded_corner_radius_bottom">90.0px</dimen>
 </resources>
diff --git a/Xiaomi/Redmi9/res/xml/power_profile.xml b/Xiaomi/Redmi9/res/xml/power_profile.xml
index 3f9ddc92a..aa3cf0ac8 100644
--- a/Xiaomi/Redmi9/res/xml/power_profile.xml
+++ b/Xiaomi/Redmi9/res/xml/power_profile.xml
@@ -64,7 +64,8 @@
     </array>
     <item name="cpu.idle">4.08</item>
     <item name="cpu.suspend">5</item>
-    <item name="cpu.active">2.55</item>. <item name="cpu.cluster_power.cluster0">2.11</item>
+    <item name="cpu.active">2.55</item>
+    <item name="cpu.cluster_power.cluster0">2.11</item>
     <item name="cpu.cluster_power.cluster1">2.22</item>
     <array name="cpu.core_speeds.cluster0">
         <value>1800000</value>