diff options
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/themes_bridge.xml | 5 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_bridge.xml | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/themes_bridge.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/themes_bridge.xml index bcb9baf94706..7125056cbb86 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/themes_bridge.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/themes_bridge.xml @@ -171,6 +171,11 @@ <!-- END Base.V14.Theme.MaterialComponents --> </style> + <!-- + ~ NOTE: Base.ThemeOverlay.MaterialComponents.PlatformBridge and + ~ ThemeOverlay.MaterialComponents.PlatformBridge have the wrong parent specified, and is fixed + ~ in values-v36/themes_bridge.xml in order to avoid compaitilibility issue with OEM customization. + --> <style name="Base.ThemeOverlay.MaterialComponents.PlatformBridge" parent="Base.V31.ThemeOverlay.AppCompat.PlatformBridge" /> <style name="ThemeOverlay.MaterialComponents.PlatformBridge" parent="Base.ThemeOverlay.AppCompat.PlatformBridge" /> </resources> diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_bridge.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_bridge.xml new file mode 100644 index 000000000000..ab5d9fbe53cf --- /dev/null +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_bridge.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + Copyright (C) 2025 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. +--> + +<!-- See appcompat/appcompat/THEMES for the theme structure. --> +<resources> + <!-- + ~ Bridge theme overlay to simulate AppCompat themes based on a platform theme. + ~ Only non-widget attributes are included here since we should still use the platform widgets. + ~ Only public theme attributes (as in platform public-final.xml) can be referenced here since + ~ this is used in modules. + --> + <style name="Base.ThemeOverlay.MaterialComponents.PlatformBridge" parent="Base.V31.ThemeOverlay.MaterialComponents.PlatformBridge" /> + <style name="ThemeOverlay.MaterialComponents.PlatformBridge" parent="Base.ThemeOverlay.MaterialComponents.PlatformBridge" /> +</resources> |