[Fix] Fix display cutout theming.

Display cutout value shortEdges is actually potentially available on API 27, and display cutout value always is available on API 30. See also https://android-developers.googleblog.com/2018/07/supporting-display-cutouts-on-edge-to.html about the potential backport to API 27.
zhanghai · Oct 3, 2023 · 3a97531 · 3a97531
1 parent 02edc07
commit 3a97531
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 42 deletions.
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
@@ -9,7 +9,13 @@
 
     <style name="Platform.V27.Theme.MaterialFiles" parent="Platform.V23.Theme.MaterialFiles">
         <item name="android:navigationBarColor">?colorPrimaryDark</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowLightNavigationBar">?isLightTheme</item>
     </style>
     <style name="Platform.Theme.MaterialFiles" parent="Platform.V27.Theme.MaterialFiles" />
+
+    <style name="Platform.V27.Theme.MaterialFiles.Immersive" parent="Platform.V21.Theme.MaterialFiles.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Immersive" parent="Platform.V27.Theme.MaterialFiles.Immersive" />
 </resources>
diff --git a/app/src/main/res/values-v27/themes_material3.xml b/app/src/main/res/values-v27/themes_material3.xml
@@ -9,7 +9,13 @@
 
     <style name="Platform.V27.Theme.MaterialFiles.Material3" parent="Platform.V23.Theme.MaterialFiles.Material3">
         <item name="android:navigationBarColor">?colorPrimaryDark</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowLightNavigationBar">?isLightTheme</item>
     </style>
     <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V27.Theme.MaterialFiles.Material3" />
+
+    <style name="Platform.V27.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V21.Theme.MaterialFiles.Material3.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V27.Theme.MaterialFiles.Material3.Immersive" />
 </resources>
diff --git a/app/src/main/res/values-v28/themes.xml b/app/src/main/res/values-v28/themes.xml
diff --git a/app/src/main/res/values-v28/themes_material3.xml b/app/src/main/res/values-v28/themes_material3.xml
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
@@ -7,14 +7,14 @@
 
 <resources>
 
-    <style name="Platform.V29.Theme.MaterialFiles" parent="Platform.V28.Theme.MaterialFiles">
+    <style name="Platform.V29.Theme.MaterialFiles" parent="Platform.V27.Theme.MaterialFiles">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>
     </style>
     <style name="Platform.Theme.MaterialFiles" parent="Platform.V29.Theme.MaterialFiles" />
 
-    <style name="Platform.V29.Theme.MaterialFiles.Immersive" parent="Platform.V28.Theme.MaterialFiles.Immersive">
+    <style name="Platform.V29.Theme.MaterialFiles.Immersive" parent="Platform.V27.Theme.MaterialFiles.Immersive">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>

diff --git a/app/src/main/res/values-v29/themes_material3.xml b/app/src/main/res/values-v29/themes_material3.xml
@@ -7,14 +7,14 @@
 
 <resources>
 
-    <style name="Platform.V29.Theme.MaterialFiles.Material3" parent="Platform.V28.Theme.MaterialFiles.Material3">
+    <style name="Platform.V29.Theme.MaterialFiles.Material3" parent="Platform.V27.Theme.MaterialFiles.Material3">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>
     </style>
     <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V29.Theme.MaterialFiles.Material3" />
 
-    <style name="Platform.V29.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V28.Theme.MaterialFiles.Material3.Immersive">
+    <style name="Platform.V29.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V27.Theme.MaterialFiles.Material3.Immersive">
         <item name="android:forceDarkAllowed">false</item>
 
         <item name="colorPrimaryDark">@android:color/transparent</item>

diff --git a/app/src/main/res/values-v30/themes.xml b/app/src/main/res/values-v30/themes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 Hai Zhang <dreaming.in.code.zh@gmail.com>
+  ~ All Rights Reserved.
+  -->
+
+<resources>
+
+    <style name="Platform.V30.Theme.MaterialFiles" parent="Platform.V29.Theme.MaterialFiles">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles" parent="Platform.V30.Theme.MaterialFiles" />
+
+    <style name="Platform.V30.Theme.MaterialFiles.Immersive" parent="Platform.V29.Theme.MaterialFiles.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Immersive" parent="Platform.V30.Theme.MaterialFiles.Immersive" />
+</resources>
diff --git a/app/src/main/res/values-v30/themes_material3.xml b/app/src/main/res/values-v30/themes_material3.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2023 Hai Zhang <dreaming.in.code.zh@gmail.com>
+  ~ All Rights Reserved.
+  -->
+
+<resources>
+
+    <style name="Platform.V30.Theme.MaterialFiles.Material3" parent="Platform.V29.Theme.MaterialFiles.Material3">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V30.Theme.MaterialFiles.Material3" />
+
+    <style name="Platform.V30.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V29.Theme.MaterialFiles.Material3.Immersive">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+    </style>
+    <style name="Platform.Theme.MaterialFiles.Material3.Immersive" parent="Platform.V30.Theme.MaterialFiles.Material3.Immersive" />
+</resources>