mirror of
https://github.com/material-components/material-components-android.git
synced 2026-02-20 08:39:55 +08:00
Merge abdc167e80b88d28db9d04a436068bfeb0965a8f into 9c5ccb76cad3072090a3c772dd613a197498be90
This commit is contained in:
commit
cbf5e85e47
@ -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>
|
||||
@ -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>
|
||||
@ -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">@android:color/transparent</item>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user