From f35bfd702eb5d1567316b110c39fad6757dc9901 Mon Sep 17 00:00:00 2001
From: manabu-nakamura <ma.nakamura@gmail.com>
Date: Sun, 21 Jan 2024 00:31:57 +0900
Subject: [PATCH 1/2] [Catalog] window overlaps with cutout area in landscape
 mode

---
 .../theme/res/values-v30/themes.xml           | 23 +++++++++++++++++++
 .../application/theme/res/values/themes.xml   |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 catalog/java/io/material/catalog/application/theme/res/values-v30/themes.xml

diff --git a/catalog/java/io/material/catalog/application/theme/res/values-v30/themes.xml b/catalog/java/io/material/catalog/application/theme/res/values-v30/themes.xml
new file mode 100644
index 00000000000..a410ca15ffc
--- /dev/null
+++ b/catalog/java/io/material/catalog/application/theme/res/values-v30/themes.xml
@@ -0,0 +1,23 @@
+<?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>
+
+  <style name="Theme.Catalog" parent="Theme.CatalogOriginal">
+    <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+  </style>
+
+</resources>
diff --git a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
index 23a717d5fd2..d79c9c1fe0b 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
@@ -16,7 +16,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <style name="Theme.Catalog" parent="Theme.Material3.DayNight.NoActionBar">
+  <style name="Theme.CatalogOriginal" parent="Theme.Material3.DayNight.NoActionBar">
     <item name="preferenceTheme">@style/CatalogPreferenceThemeOverlay</item>
     <item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
@@ -24,6 +24,8 @@
     <item name="windowActionModeOverlay">true</item>
   </style>
 
+  <style name="Theme.Catalog" parent="Theme.CatalogOriginal"/>
+
   <!-- A theme which sets the status bar color to transparent -->
   <style name="Theme.Catalog.TransparentStatus">
     <item name="android:statusBarColor" tools:targetApi="21">@android:color/transparent</item>

From abdc167e80b88d28db9d04a436068bfeb0965a8f Mon Sep 17 00:00:00 2001
From: nakamura <71050561+manabu-nakamura@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:24:02 +0900
Subject: [PATCH 2/2] Update themes.xml

---
 .../io/material/catalog/application/theme/res/values/themes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
index 98f9220f7bd..522ccbe30cd 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
@@ -16,7 +16,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <style name="Theme.Catalog" parent="Theme.Material3Expressive.DayNight.NoActionBar">
+  <style name="Theme.CatalogOriginal" parent="Theme.Material3Expressive.DayNight.NoActionBar">
     <item name="preferenceTheme">@style/CatalogPreferenceThemeOverlay</item>
     <item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>