Improve notch bar killer mods

Signed-off-by: DrDisagree <29881338+Mahmud0808@users.noreply.github.com>
Mahmud0808 · Feb 1, 2025 · a02178f · a02178f
1 parent 4878d98
commit a02178f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/app/src/main/java/com/drdisagree/iconify/services/TileNotchBarKiller.kt b/app/src/main/java/com/drdisagree/iconify/services/TileNotchBarKiller.kt
@@ -53,6 +53,12 @@ class TileNotchBarKiller : TileService() {
                     FRAMEWORK_PACKAGE,
                     "bool",
                     "config_fillMainBuiltInDisplayCutout",
+                    "false"
+                ),
+                ResourceEntry(
+                    FRAMEWORK_PACKAGE,
+                    "bool",
+                    "config_maskMainBuiltInDisplayCutout",
                     "true"
                 ),
                 ResourceEntry(
@@ -76,6 +82,11 @@ class TileNotchBarKiller : TileService() {
                     "bool",
                     "config_fillMainBuiltInDisplayCutout"
                 ),
+                ResourceEntry(
+                    FRAMEWORK_PACKAGE,
+                    "bool",
+                    "config_maskMainBuiltInDisplayCutout"
+                ),
                 ResourceEntry(
                     FRAMEWORK_PACKAGE,
                     "string",

diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/tweaks/Miscellaneous.kt b/app/src/main/java/com/drdisagree/iconify/ui/fragments/tweaks/Miscellaneous.kt
@@ -134,15 +134,21 @@ class Miscellaneous : BaseFragment() {
                     FRAMEWORK_PACKAGE,
                     "bool",
                     "config_fillMainBuiltInDisplayCutout",
-                    "true"
+                    "false"
                 )
                 val resourceEntry12 = ResourceEntry(
+                    FRAMEWORK_PACKAGE,
+                    "bool",
+                    "config_maskMainBuiltInDisplayCutout",
+                    "true"
+                )
+                val resourceEntry13 = ResourceEntry(
                     FRAMEWORK_PACKAGE,
                     "string",
                     "config_mainBuiltInDisplayCutout",
                     "M 0,0 L 0, 0 C 0,0 0,0 0,0"
                 )
-                val resourceEntry13 = ResourceEntry(
+                val resourceEntry14 = ResourceEntry(
                     FRAMEWORK_PACKAGE,
                     "string",
                     "config_mainBuiltInDisplayCutoutRectApproximation",
@@ -162,6 +168,7 @@ class Miscellaneous : BaseFragment() {
                 resourceEntry11.setLandscape(true)
                 resourceEntry12.setLandscape(true)
                 resourceEntry13.setLandscape(true)
+                resourceEntry14.setLandscape(true)
 
                 if (isChecked) {
                     buildOverlayWithResource(
@@ -178,7 +185,8 @@ class Miscellaneous : BaseFragment() {
                         resourceEntry10,
                         resourceEntry11,
                         resourceEntry12,
-                        resourceEntry13
+                        resourceEntry13,
+                        resourceEntry14
                     )
                 } else {
                     removeResourceFromOverlay(
@@ -195,7 +203,8 @@ class Miscellaneous : BaseFragment() {
                         resourceEntry10,
                         resourceEntry11,
                         resourceEntry12,
-                        resourceEntry13
+                        resourceEntry13,
+                        resourceEntry14
                     )
                 }
             }
@@ -228,6 +237,12 @@ class Miscellaneous : BaseFragment() {
                             FRAMEWORK_PACKAGE,
                             "bool",
                             "config_fillMainBuiltInDisplayCutout",
+                            "false"
+                        ),
+                        ResourceEntry(
+                            FRAMEWORK_PACKAGE,
+                            "bool",
+                            "config_maskMainBuiltInDisplayCutout",
                             "true"
                         ),
                         ResourceEntry(
@@ -251,6 +266,11 @@ class Miscellaneous : BaseFragment() {
                             "bool",
                             "config_fillMainBuiltInDisplayCutout"
                         ),
+                        ResourceEntry(
+                            FRAMEWORK_PACKAGE,
+                            "bool",
+                            "config_maskMainBuiltInDisplayCutout"
+                        ),
                         ResourceEntry(
                             FRAMEWORK_PACKAGE,
                             "string",