Fix status bar height for Android 12L

Prior to 12L:
- values: sbh links to sbh_port
- values-land: sbh links to sbh_land
However, in 12L this was flipped around:
- values: sbh_port links to sbh
- values-land: defines sbh standalone
To fix for 12L without breaking them for prior versions, break the link and define each of them

Also, while we're at it, remove a few links in my own overlays, as they might break similarly in the future

Change-Id: Ib4d1896599f47a39274c4930fd765891bf143f7d

Asus/ZenFone5/res/values-land/notch.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Asus/ZenFone5/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
     <!-- Height of the status bar in landscape -->

Asus/ZenFone5Z/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Asus/ZenFone5Z/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
     <!-- Height of the status bar in landscape -->

Asus/ZenFoneMaxM2/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Asus/ZenFoneMaxM2/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">57px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">57px</dimen>
     <!-- Height of the status bar in landscape -->

Asus/ZenFoneMaxShot/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Asus/ZenFoneMaxShot/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
     <!-- Height of the status bar in landscape -->

Asus/Zenfone5-10/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28dp</dimen>
+</resources>

Asus/Zenfone5-10/res/values/config.xml

@@ -4,7 +4,8 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
-    <dimen name="status_bar_height_portrait">87.0px</dimen>
+    <dimen name="status_bar_height">87px</dimen>
+    <dimen name="status_bar_height_portrait">87px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>

Essential/PH-1/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">84px</dimen>
+</resources>

Essential/PH-1/res/values/notch.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<dimen name="status_bar_height_portrait">144.0px</dimen>
-<dimen name="status_bar_height_landscape">84px</dimen>
-<string name="config_mainBuiltInDisplayCutout">M -70, 0 L -70, 137 L 70, 137 L 70, 0 Z</string>
+    <dimen name="status_bar_height">144.0px</dimen>
+    <dimen name="status_bar_height_portrait">144.0px</dimen>
+    <dimen name="status_bar_height_landscape">84px</dimen>
+    <string name="config_mainBuiltInDisplayCutout">M -70, 0 L -70, 137 L 70, 137 L 70, 0 Z</string>
 </resources>

Huawei/ARE/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">96px</dimen>
+</resources>

Huawei/ARE/res/values/config.xml

@@ -3,13 +3,14 @@
     <bool name="config_automatic_brightness_available">true</bool>
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
-
+
+    <dimen name="status_bar_height">96px</dimen>
     <dimen name="status_bar_height_portrait">96px</dimen>
     <dimen name="status_bar_height_landscape">96px</dimen>
-    
+
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>
     <fraction name="config_maximumScreenDimRatio">20.000004%</fraction>
-    
+
     <integer name="config_screenBrightnessDark">1</integer>
     <integer name="config_screenBrightnessDim">6</integer>
     <integer name="config_screenBrightnessDoze">1</integer>
@@ -19,7 +20,7 @@
     <integer name="config_autoBrightnessDarkeningLightDebounce">8000</integer>
     <integer name="config_brightness_ramp_rate_fast">180</integer>
     <integer name="config_brightness_ramp_rate_slow">60</integer>
-    
+
     <integer-array name="config_autoBrightnessLevels">
         <item>8</item>
         <item>55</item>
@@ -35,6 +36,6 @@
         <item>250</item>
         <item>255</item>
     </integer-array>
-    
+
     <string name="config_mainBuiltInDisplayCutout">M-100,0c17.9,0 32.8,19.4 32.8,32.8l0,0C-62.4,68.6 -38.7,96 0,96c37.1,0 62.4,-27.4 67.3,-63.2l0,0C67.3,19.4 82.1,0 100,0H-100z</string>
 </resources>

Huawei/hi6250/ANE/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Huawei/hi6250/ANE/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">90px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">90px</dimen>
     <!-- Height of the status bar in landscape -->

Huawei/kirin970/CLT/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Huawei/kirin970/CLT/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
     <!-- Height of the status bar in landscape -->

Huawei/kirin970/COL/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">90px</dimen>
+</resources>

Huawei/kirin970/COL/res/values/config.xml

@@ -39,6 +39,7 @@
     <dimen name="navigation_bar_width">7.5mm</dimen>
     <dimen name="notification_header_padding_bottom">8.0dip</dimen>
     <dimen name="notification_header_padding_top">8.0dip</dimen>
+    <dimen name="status_bar_height">90px</dimen>
     <dimen name="status_bar_height_portrait">90px</dimen>
     <dimen name="status_bar_height_landscape">90px</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -156,0 L -156,90 L 156,90 L 156,0 Z</string>

Huawei/kirin970/COR/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">88px</dimen>
+</resources>

Huawei/kirin970/COR/res/values/values.xml

@@ -67,6 +67,8 @@
     <dimen name="navigation_bar_width">88px</dimen>
     <dimen name="notification_header_padding_top">8.0dip</dimen>
     <dimen name="notification_header_padding_bottom">8.0dip</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar in landscape -->

Huawei/kirin970/EML/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Huawei/kirin970/EML/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">85px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">85px</dimen>
     <!-- Height of the status bar in landscape -->

Infinix/Note10Pro/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>

Infinix/Note10Pro/res/values/config.xml

@@ -15,8 +15,9 @@
     <bool name="skip_restoring_network_selection">true</bool>
 
     <dimen name="quick_qs_offset_height">36.0dip</dimen>
-    <dimen name="status_bar_height_landscape">28.0dip</dimen>
+    <dimen name="status_bar_height">36.0dip</dimen>
     <dimen name="status_bar_height_portrait">36.0dip</dimen>
+    <dimen name="status_bar_height_landscape">28.0dip</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">10</integer>
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>

Infinix/Note7/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>

Infinix/Note7/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">40.0dip</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">40.0dip</dimen>
     <!-- Height of the status bar in landscape -->

Infinix/Note8/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>

Infinix/Note8/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">44.0dip</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">44.0dip</dimen>
     <!-- Height of the status bar in landscape -->

Infinix/S4/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>

Infinix/S4/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">50px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">50px</dimen>
     <!-- Height of the status bar in landscape -->

Infinix/Zero6/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Infinix/Zero6/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">86.0px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">86.0px</dimen>
     <!-- Height of the status bar in landscape -->

LG/G7/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

LG/G7/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
     <!-- Height of the status bar in landscape -->

LG/V40/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

LG/V40/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
     <!-- Height of the status bar in landscape -->

LG/mfh505glm-SystemUI/res/values/config.xml

@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">35px</dimen>
     <dimen name="status_bar_padding_end">35px</dimen>
     <dimen name="status_bar_header_height_keyguard">124px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">35px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">35px</dimen>
 </resources>

LG/mfh505glm/res/values-land/config.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>

LG/mfh505glm/res/values/config.xml

@@ -3,9 +3,10 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">124px</dimen>
     <dimen name="status_bar_height_portrait">124px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">124px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 

Lenovo/Z5/res/values-land/notch.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Lenovo/Z5/res/values/notch.xml

@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
     <!-- Height of the status bar in landscape -->

Meizu/M2181-SystemUI/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
+</resources>

Meizu/M2181-SystemUI/res/values/config.xml

@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">50px</dimen>
     <dimen name="status_bar_padding_end">50px</dimen>
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="status_bar_header_height_keyguard">96px</dimen>
+    <dimen name="keyguard_carrier_text_margin">50px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">50px</dimen>
 </resources>

Meizu/M2181/res/values-land/config.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>

Meizu/M2181/res/values/config.xml

@@ -7,9 +7,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">96px</dimen>
     <dimen name="status_bar_height_portrait">96px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">96px</dimen>
 
     <integer name="config_screenBrightnessDoze">5</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>

Moto/E6Plus/res/values/config.xml

@@ -19,6 +19,7 @@
         <item>mobile_ia,14,0,2,-1,true</item>
         <item>mobile_emergency,15,0,2,-1,true</item>
     </string-array>
+    <dimen name="status_bar_height">24.0dip</dimen>
     <dimen name="status_bar_height_portrait">24.0dip</dimen>
     <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">1500</integer>

Moto/G100-Nio/res/values-land/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>

Moto/G100-Nio/res/values/config.xml

@@ -263,6 +263,8 @@
     <!-- Default radius of the software rounded corners. -->
     <dimen name="rounded_corner_radius">105px</dimen>
 
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">120px</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">120px</dimen>