From b1dc894fe807b91efd410dae681130abb2f8b076 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Mon, 30 Jun 2025 10:31:19 -0500
Subject: [PATCH] PM-23136: Only apply 'always' display cutout mode on API 30
 and up (#5446)

---
 app/src/main/res/values-v30/values.xml | 5 +++++
 app/src/main/res/values/styles.xml     | 2 +-
 app/src/main/res/values/values.xml     | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-v30/values.xml

diff --git a/app/src/main/res/values-v30/values.xml b/app/src/main/res/values-v30/values.xml
new file mode 100644
index 0000000000..a48a843341
--- /dev/null
+++ b/app/src/main/res/values-v30/values.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Always -->
+    <integer name="displayCutoutMode">3</integer>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 05ca0b6eb5..3d7bba8390 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">@integer/displayCutoutMode</item>
         <item name="android:backgroundDimAmount">@dimen/dialogDimBackgroundAmount</item>
     </style>
 
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 62acf4be64..550cc1a3cf 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="dialogDimBackgroundAmount" format="float">0.55</dimen>
+    <!-- default -->
+    <integer name="displayCutoutMode">0</integer>
 </resources>