Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb8a789f authored by Andrew Cole's avatar Andrew Cole Committed by Android Build Coastguard Worker
Browse files

Updating materialColorSurfaceContainerHighest color access

For any view files applying the WidgetConatinerTheme via widgetsTheme they were incorrectly inheriting themes and skipping the AppTheme provided but only in light mode. In dark mode the WidgetContainerTheme.Dark was correctly inheriting the theme.

To avoid a risky theme update for all widgetsThemes we just modify the color accessor to use @color instead of ?attr as these colors should not be attributes AFAIKT

Bug: b/289305591
Test: Follow repro steps on the bug for smartspace
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9af3bd03db3c19a07a4015471ee5c83d364fd36)
Merged-In: I26cc3239763f8eac3dfe5f094c6757692f46d1bc
Change-Id: I26cc3239763f8eac3dfe5f094c6757692f46d1bc
parent 1672e8a3
Loading
Loading
Loading
Loading

res/color-v31/surface.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2021, 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.
*/
-->
<selector
    xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:color="?attr/materialColorSurfaceContainerHighest"/>
</selector>
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle" >
    <solid android:color="@color/surface" />
    <solid android:color="@color/material_color_surface_container_highest" />
    <corners
        android:topLeftRadius="?android:attr/dialogCornerRadius"
        android:topRightRadius="?android:attr/dialogCornerRadius" />
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
                    android:topRightRadius="12dp"
                    android:bottomLeftRadius="4dp"
                    android:bottomRightRadius="4dp"  />
                <solid android:color="@color/surface"/>
                <solid android:color="@color/material_color_surface_container_highest"/>
                <stroke
                    android:width="2dp"
                    android:color="@color/button_bg"/>