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

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

Merge "Migrate materialColor* attributes into colors" into main

parents 0bb2421c bc02103a

quickstep/res/color/all_set_bg_primary.xml

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

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?attr/materialColorPrimaryContainer"/>

    <item android:color="@color/materialColorPrimaryContainer"/>

</selector>

quickstep/res/color/all_set_bg_tertiary.xml

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

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?attr/materialColorTertiary"/>

    <item android:color="@color/materialColorTertiary"/>

</selector>

quickstep/res/color/bubblebar_drop_target_bg_color.xml

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

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:alpha="0.35" android:color="?attr/materialColorPrimaryContainer" />

    <item android:alpha="0.35" android:color="@color/materialColorPrimaryContainer" />

</selector>
 
 No newline at end of file

quickstep/res/color/menu_item_hover_state_color.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_hovered="false" android:color="?attr/materialColorSurfaceBright" />

    <item android:state_hovered="true" android:color="?attr/materialColorSurfaceVariant" />

    <item android:state_hovered="false" android:color="@color/materialColorSurfaceBright" />

    <item android:state_hovered="true" android:color="@color/materialColorSurfaceVariant" />

</selector>
 
 No newline at end of file

quickstep/res/color/taskbar_minimized_app_indicator_color.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
  ~ limitations under the License.

  -->

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

    <item android:color="?attr/materialColorOutline"/>

    <item android:color="@color/materialColorOutline"/>

</selector>