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

Commit 13d9588f authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android (Google) Code Review
Browse files

Merge "Updates many launcher color to new dynamic tokens" into main

parents 64832004 0d6190eb

res/color-night-v31/popup_color_background.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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="@android:color/system_neutral1_900"

        android:lStar="12" />

</selector>

res/color-v31/popup_color_background.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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="@android:color/system_neutral1_50"

        android:lStar="94" />

</selector>

res/color/popup_color_background.xml

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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/popupColorBackground" />

</selector>

res/drawable/popup_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="?attr/popupColorBackground"/>

    <solid android:color="?attr/materialColorSurfaceContainer"/>

    <corners android:radius="@dimen/dialogCornerRadius"/>

</shape>
 
 No newline at end of file

res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <attr name="popupColorPrimary" format="color" />

    <attr name="popupColorSecondary" format="color" />

    <attr name="popupColorTertiary" format="color" />

    <attr name="popupColorBackground" format="color" />

    <attr name="popupTextColor" format="color" />

    <attr name="popupShadeFirst" format="color" />

    <attr name="popupShadeSecond" format="color" />