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

Commit 8bba516c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Align color resources in launcher projects." into main

parents 6babde40 f38d98d1

go/quickstep/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->

<resources>

    <!-- App themes -->

    <style name="LauncherTheme" parent="@style/BaseLauncherTheme">

    <style name="LauncherTheme" parent="@style/DynamicColorsBaseLauncherTheme">

        <item name="overviewButtonTextColor">@color/go_overview_text_color</item>

        <item name="overviewButtonIconColor">@color/go_overview_text_color</item>

        <item name="overviewButtonBackgroundColor">@color/go_overview_button_color</item>

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="?androidprv:attr/materialColorPrimaryContainer"/>

    <item android:color="?attr/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="?androidprv:attr/materialColorTertiary"/>

    <item android:color="?attr/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="?androidprv:attr/materialColorPrimaryContainer" />

    <item android:alpha="0.35" android:color="?attr/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="?androidprv:attr/materialColorSurfaceBright" />

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

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

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

</selector>
 
 No newline at end of file