From 237da71b6c8ea5121f025d7e0cd04cfea41a7b2b Mon Sep 17 00:00:00 2001
From: Tadi <TadiT7@github.com>
Date: Tue, 5 Feb 2019 00:24:11 +0100
Subject: [PATCH] Dehardcode status_bar_height for Pie

---
 Asus/ZenFone5/res/values-land/notch.xml       | 22 -------------------
 Asus/ZenFone5/res/values/notch.xml            |  4 +---
 Asus/ZenFone5Z/res/values-land/notch.xml      | 22 -------------------
 Asus/ZenFone5Z/res/values/notch.xml           |  4 +---
 Huawei/hi6250/ANE/res/values-land/notch.xml   | 22 -------------------
 Huawei/hi6250/ANE/res/values/notch.xml        |  4 +---
 Huawei/kirin970/CLT/res/values-land/notch.xml | 22 -------------------
 Huawei/kirin970/CLT/res/values/notch.xml      |  4 +---
 Huawei/kirin970/EML/res/values-land/notch.xml | 22 -------------------
 Huawei/kirin970/EML/res/values/notch.xml      |  4 +---
 LG/G7/res/values-land/notch.xml               | 22 -------------------
 LG/G7/res/values/notch.xml                    |  4 +---
 LG/V40/res/values-land/notch.xml              | 22 -------------------
 LG/V40/res/values/notch.xml                   |  4 +---
 Lenovo/Z5/res/values-land/notch.xml           | 22 -------------------
 Lenovo/Z5/res/values/notch.xml                |  4 +---
 Nokia/DRG-6.1Plus-X6/res/values/config.xml    |  1 -
 OnePlus/OP6/res/values-land/notch.xml         | 22 -------------------
 OnePlus/OP6/res/values/notch.xml              |  4 +---
 Sharp/S2/res/values-land/notch.xml            | 22 -------------------
 Sharp/S2/res/values/notch.xml                 |  2 --
 Xiaomi/Mi8/res/values-land/notch.xml          | 22 -------------------
 Xiaomi/Mi8/res/values/notch.xml               |  2 --
 Xiaomi/Mi8EE/res/values-land/notch.xml        | 22 -------------------
 Xiaomi/Mi8EE/res/values/notch.xml             |  2 --
 Xiaomi/Mi8Lite/res/values-land/notch.xml      | 22 -------------------
 Xiaomi/Mi8Lite/res/values/notch.xml           |  2 --
 Xiaomi/Mi8Pro/res/values-land/notch.xml       | 22 -------------------
 Xiaomi/Mi8Pro/res/values/notch.xml            |  2 --
 Xiaomi/Mi8SE/res/values-land/notch.xml        | 22 -------------------
 Xiaomi/Mi8SE/res/values/notch.xml             |  2 --
 Xiaomi/MiA2Lite/res/values-land/notch.xml     | 22 -------------------
 Xiaomi/MiA2Lite/res/values/notch.xml          |  4 +---
 Xiaomi/MiPlay/res/values-land/notch.xml       | 22 -------------------
 Xiaomi/MiPlay/res/values/notch.xml            |  2 --
 Xiaomi/PocoF1/res/values-land/notch.xml       | 22 -------------------
 Xiaomi/PocoF1/res/values/notch.xml            |  4 +---
 Xiaomi/Redmi6Pro/res/values-land/notch.xml    | 22 -------------------
 Xiaomi/Redmi6Pro/res/values/notch.xml         |  4 +---
 .../RedmiNote6Pro/res/values-land/notch.xml   | 22 -------------------
 Xiaomi/RedmiNote6Pro/res/values/notch.xml     |  2 --
 41 files changed, 12 insertions(+), 493 deletions(-)
 delete mode 100644 Asus/ZenFone5/res/values-land/notch.xml
 delete mode 100644 Asus/ZenFone5Z/res/values-land/notch.xml
 delete mode 100644 Huawei/hi6250/ANE/res/values-land/notch.xml
 delete mode 100644 Huawei/kirin970/CLT/res/values-land/notch.xml
 delete mode 100644 Huawei/kirin970/EML/res/values-land/notch.xml
 delete mode 100644 LG/G7/res/values-land/notch.xml
 delete mode 100644 LG/V40/res/values-land/notch.xml
 delete mode 100644 Lenovo/Z5/res/values-land/notch.xml
 delete mode 100644 OnePlus/OP6/res/values-land/notch.xml
 delete mode 100644 Sharp/S2/res/values-land/notch.xml
 delete mode 100644 Xiaomi/Mi8/res/values-land/notch.xml
 delete mode 100644 Xiaomi/Mi8EE/res/values-land/notch.xml
 delete mode 100644 Xiaomi/Mi8Lite/res/values-land/notch.xml
 delete mode 100644 Xiaomi/Mi8Pro/res/values-land/notch.xml
 delete mode 100644 Xiaomi/Mi8SE/res/values-land/notch.xml
 delete mode 100644 Xiaomi/MiA2Lite/res/values-land/notch.xml
 delete mode 100644 Xiaomi/MiPlay/res/values-land/notch.xml
 delete mode 100644 Xiaomi/PocoF1/res/values-land/notch.xml
 delete mode 100644 Xiaomi/Redmi6Pro/res/values-land/notch.xml
 delete mode 100644 Xiaomi/RedmiNote6Pro/res/values-land/notch.xml

diff --git a/Asus/ZenFone5/res/values-land/notch.xml b/Asus/ZenFone5/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Asus/ZenFone5/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Asus/ZenFone5/res/values/notch.xml b/Asus/ZenFone5/res/values/notch.xml
index 969b47b..a0550ef 100644
--- a/Asus/ZenFone5/res/values/notch.xml
+++ b/Asus/ZenFone5/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -218,0 L -218,87 L 218,87 L 218,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Asus/ZenFone5Z/res/values-land/notch.xml b/Asus/ZenFone5Z/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Asus/ZenFone5Z/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Asus/ZenFone5Z/res/values/notch.xml b/Asus/ZenFone5Z/res/values/notch.xml
index 969b47b..a0550ef 100644
--- a/Asus/ZenFone5Z/res/values/notch.xml
+++ b/Asus/ZenFone5Z/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -218,0 L -218,87 L 218,87 L 218,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Huawei/hi6250/ANE/res/values-land/notch.xml b/Huawei/hi6250/ANE/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Huawei/hi6250/ANE/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Huawei/hi6250/ANE/res/values/notch.xml b/Huawei/hi6250/ANE/res/values/notch.xml
index b98d4fc..8c391b5 100644
--- a/Huawei/hi6250/ANE/res/values/notch.xml
+++ b/Huawei/hi6250/ANE/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">90px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">90px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -156,0 L -156,90 L 156,90 L 156,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Huawei/kirin970/CLT/res/values-land/notch.xml b/Huawei/kirin970/CLT/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Huawei/kirin970/CLT/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Huawei/kirin970/CLT/res/values/notch.xml b/Huawei/kirin970/CLT/res/values/notch.xml
index 6351519..ba85b16 100644
--- a/Huawei/kirin970/CLT/res/values/notch.xml
+++ b/Huawei/kirin970/CLT/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -130,0 L -130,81 L 130,81 L 130,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Huawei/kirin970/EML/res/values-land/notch.xml b/Huawei/kirin970/EML/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Huawei/kirin970/EML/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Huawei/kirin970/EML/res/values/notch.xml b/Huawei/kirin970/EML/res/values/notch.xml
index daf0306..3a24285 100644
--- a/Huawei/kirin970/EML/res/values/notch.xml
+++ b/Huawei/kirin970/EML/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">85px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">85px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -129,0 L -129,85 L 129,85 L 129,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/LG/G7/res/values-land/notch.xml b/LG/G7/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/LG/G7/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/LG/G7/res/values/notch.xml b/LG/G7/res/values/notch.xml
index ee3ffc8..ecac092 100644
--- a/LG/G7/res/values/notch.xml
+++ b/LG/G7/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -250,0 L -250,94 L 250,94 L 250,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/LG/V40/res/values-land/notch.xml b/LG/V40/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/LG/V40/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/LG/V40/res/values/notch.xml b/LG/V40/res/values/notch.xml
index ee3ffc8..ecac092 100644
--- a/LG/V40/res/values/notch.xml
+++ b/LG/V40/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -250,0 L -250,94 L 250,94 L 250,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Lenovo/Z5/res/values-land/notch.xml b/Lenovo/Z5/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Lenovo/Z5/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Lenovo/Z5/res/values/notch.xml b/Lenovo/Z5/res/values/notch.xml
index 969b47b..a0550ef 100644
--- a/Lenovo/Z5/res/values/notch.xml
+++ b/Lenovo/Z5/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -218,0 L -218,87 L 218,87 L 218,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Nokia/DRG-6.1Plus-X6/res/values/config.xml b/Nokia/DRG-6.1Plus-X6/res/values/config.xml
index cfee504..f2d038a 100644
--- a/Nokia/DRG-6.1Plus-X6/res/values/config.xml
+++ b/Nokia/DRG-6.1Plus-X6/res/values/config.xml
@@ -4,7 +4,6 @@
     <bool name="config_dozePulsePickup">true</bool>
 
     <dimen name="status_bar_height_portrait">89.0px</dimen>
-    <dimen name="status_bar_height">89.0px</dimen>
     <dimen name="status_bar_height_landscape">89.0px</dimen>
 
 	<!-- test -->
diff --git a/OnePlus/OP6/res/values-land/notch.xml b/OnePlus/OP6/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/OnePlus/OP6/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/OnePlus/OP6/res/values/notch.xml b/OnePlus/OP6/res/values/notch.xml
index 0ae411d..4141502 100644
--- a/OnePlus/OP6/res/values/notch.xml
+++ b/OnePlus/OP6/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">80px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">80px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -160,0 L -160,80 L 160,80 L 160,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Sharp/S2/res/values-land/notch.xml b/Sharp/S2/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Sharp/S2/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Sharp/S2/res/values/notch.xml b/Sharp/S2/res/values/notch.xml
index d24bb08..6b1d992 100644
--- a/Sharp/S2/res/values/notch.xml
+++ b/Sharp/S2/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">121.0px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">121px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -60,0 L -60,121 L 60,121 L 60,0 Z</string>
diff --git a/Xiaomi/Mi8/res/values-land/notch.xml b/Xiaomi/Mi8/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/Mi8/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/Mi8/res/values/notch.xml b/Xiaomi/Mi8/res/values/notch.xml
index 93b43fa..5879f72 100644
--- a/Xiaomi/Mi8/res/values/notch.xml
+++ b/Xiaomi/Mi8/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
diff --git a/Xiaomi/Mi8EE/res/values-land/notch.xml b/Xiaomi/Mi8EE/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/Mi8EE/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/Mi8EE/res/values/notch.xml b/Xiaomi/Mi8EE/res/values/notch.xml
index 93b43fa..5879f72 100644
--- a/Xiaomi/Mi8EE/res/values/notch.xml
+++ b/Xiaomi/Mi8EE/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
diff --git a/Xiaomi/Mi8Lite/res/values-land/notch.xml b/Xiaomi/Mi8Lite/res/values-land/notch.xml
deleted file mode 100644
index 8d3f98a..0000000
--- a/Xiaomi/Mi8Lite/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
diff --git a/Xiaomi/Mi8Lite/res/values/notch.xml b/Xiaomi/Mi8Lite/res/values/notch.xml
index 0968a40..0fb9eee 100644
--- a/Xiaomi/Mi8Lite/res/values/notch.xml
+++ b/Xiaomi/Mi8Lite/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -160,0 L -160,81 L 160,81 L 160,0 Z</string>
diff --git a/Xiaomi/Mi8Pro/res/values-land/notch.xml b/Xiaomi/Mi8Pro/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/Mi8Pro/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/Mi8Pro/res/values/notch.xml b/Xiaomi/Mi8Pro/res/values/notch.xml
index 93b43fa..5879f72 100644
--- a/Xiaomi/Mi8Pro/res/values/notch.xml
+++ b/Xiaomi/Mi8Pro/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
diff --git a/Xiaomi/Mi8SE/res/values-land/notch.xml b/Xiaomi/Mi8SE/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/Mi8SE/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/Mi8SE/res/values/notch.xml b/Xiaomi/Mi8SE/res/values/notch.xml
index 943c950..ab0425b 100644
--- a/Xiaomi/Mi8SE/res/values/notch.xml
+++ b/Xiaomi/Mi8SE/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">85px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">85px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -266,0 L -266,85 L 266,85 L 266,0 Z</string>
diff --git a/Xiaomi/MiA2Lite/res/values-land/notch.xml b/Xiaomi/MiA2Lite/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/MiA2Lite/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/MiA2Lite/res/values/notch.xml b/Xiaomi/MiA2Lite/res/values/notch.xml
index 1a14461..812369c 100644
--- a/Xiaomi/MiA2Lite/res/values/notch.xml
+++ b/Xiaomi/MiA2Lite/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">89px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">89px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
-    <string translatable="false" name="config_mainBuiltInDisplayCutout">M -186,0 L -186,89 L 186,89 L 186,0 Z</string>
+	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -186,0 L -186,94 L 186,94 L 186,0 Z</string>
 </resources>
diff --git a/Xiaomi/MiPlay/res/values-land/notch.xml b/Xiaomi/MiPlay/res/values-land/notch.xml
deleted file mode 100644
index 8d3f98a..0000000
--- a/Xiaomi/MiPlay/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
diff --git a/Xiaomi/MiPlay/res/values/notch.xml b/Xiaomi/MiPlay/res/values/notch.xml
index cf0a8f5..a5f97e2 100644
--- a/Xiaomi/MiPlay/res/values/notch.xml
+++ b/Xiaomi/MiPlay/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">110px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">110px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
     </resources>
diff --git a/Xiaomi/PocoF1/res/values-land/notch.xml b/Xiaomi/PocoF1/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/PocoF1/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/PocoF1/res/values/notch.xml b/Xiaomi/PocoF1/res/values/notch.xml
index cc573d4..3adf0d2 100644
--- a/Xiaomi/PocoF1/res/values/notch.xml
+++ b/Xiaomi/PocoF1/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">90px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">90px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -270,0 L -270,90 L 270,90 L 270,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Xiaomi/Redmi6Pro/res/values-land/notch.xml b/Xiaomi/Redmi6Pro/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/Redmi6Pro/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/Redmi6Pro/res/values/notch.xml b/Xiaomi/Redmi6Pro/res/values/notch.xml
index abe60d6..f53225a 100644
--- a/Xiaomi/Redmi6Pro/res/values/notch.xml
+++ b/Xiaomi/Redmi6Pro/res/values/notch.xml
@@ -19,9 +19,7 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -186,0 L -186,94 L 186,94 L 186,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml b/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
deleted file mode 100644
index 7e9d1fc..0000000
--- a/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/Xiaomi/RedmiNote6Pro/res/values/notch.xml b/Xiaomi/RedmiNote6Pro/res/values/notch.xml
index c227fc1..a144bb8 100644
--- a/Xiaomi/RedmiNote6Pro/res/values/notch.xml
+++ b/Xiaomi/RedmiNote6Pro/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -280,0 L -280,88 L 280,88 L 280,0 Z</string>