From 94b5a9e1475a362e80fa1c9223645541092830a1 Mon Sep 17 00:00:00 2001
From: Lucas Silva <lusilva@google.com>
Date: Mon, 1 May 2023 15:21:11 -0400
Subject: [PATCH] Fix colors for dreams settings according to new spec

Fixes: 279780657
Test: open settings > display > screen saver and verified colors are
correct in both light/dark modes

Change-Id: Ibb2ba40807c937161f4dfa565f10d0ca2fb35549
---
 res/color/dream_card_color_state_list.xml     |  4 ++--
 .../dream_card_icon_color_state_list.xml      |  4 ++--
 .../dream_card_summary_color_state_list.xml   | 22 +++++++++++++++++++
 .../dream_card_text_color_state_list.xml      |  4 ++--
 res/drawable/dream_default_preview_icon.xml   |  3 ++-
 res/drawable/dream_preview_rounded_bg.xml     |  2 +-
 res/layout/dream_preference_layout.xml        |  2 +-
 res/layout/dream_preview_button.xml           |  7 +++---
 8 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 res/color/dream_card_summary_color_state_list.xml

diff --git a/res/color/dream_card_color_state_list.xml b/res/color/dream_card_color_state_list.xml
index eae3fe46a6d..082408d1583 100644
--- a/res/color/dream_card_color_state_list.xml
+++ b/res/color/dream_card_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
-    <item android:color="?androidprv:attr/materialColorSurfaceContainer"/>
+    <item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimaryContainer"/>
+    <item android:color="?androidprv:attr/materialColorSurfaceBright"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/dream_card_icon_color_state_list.xml b/res/color/dream_card_icon_color_state_list.xml
index a91ae3d3be3..ed34ae39357 100644
--- a/res/color/dream_card_icon_color_state_list.xml
+++ b/res/color/dream_card_icon_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary"/>
-    <item android:color="?androidprv:attr/materialColorPrimaryContainer"/>
+    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
+    <item android:color="?androidprv:attr/materialColorPrimary"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/dream_card_summary_color_state_list.xml b/res/color/dream_card_summary_color_state_list.xml
new file mode 100644
index 00000000000..a1845f44d95
--- /dev/null
+++ b/res/color/dream_card_summary_color_state_list.xml
@@ -0,0 +1,22 @@
+<?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"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
+    <item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/>
+</selector>
\ No newline at end of file
diff --git a/res/color/dream_card_text_color_state_list.xml b/res/color/dream_card_text_color_state_list.xml
index bd1f16578ea..b39bbed75c9 100644
--- a/res/color/dream_card_text_color_state_list.xml
+++ b/res/color/dream_card_text_color_state_list.xml
@@ -17,6 +17,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary"/>
-    <item android:color="?android:attr/textColorPrimary"/>
+    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
+    <item android:color="?androidprv:attr/materialColorOnSurface"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/dream_default_preview_icon.xml b/res/drawable/dream_default_preview_icon.xml
index 7d247bb2957..8989929fdd7 100644
--- a/res/drawable/dream_default_preview_icon.xml
+++ b/res/drawable/dream_default_preview_icon.xml
@@ -15,10 +15,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <path android:fillColor="?android:attr/textColorSecondary"
+    <path android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
           android:pathData="M3,19Q2.175,19 1.588,18.413Q1,17.825 1,17V7Q1,6.175 1.588,5.588Q2.175,5 3,5H13Q13.825,5 14.413,5.588Q15,6.175 15,7V17Q15,17.825 14.413,18.413Q13.825,19 13,19ZM3,17H13Q13,17 13,17Q13,17 13,17V7Q13,7 13,7Q13,7 13,7H3Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17ZM17,19V5H19V19ZM21,19V5H23V19ZM4,15H12L9.4,11.5L7.5,14L6.1,12.15ZM3,7Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17Q3,17 3,17Q3,17 3,17V7Q3,7 3,7Q3,7 3,7Z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/dream_preview_rounded_bg.xml b/res/drawable/dream_preview_rounded_bg.xml
index 2aae26b2ad2..7cae599b6c8 100644
--- a/res/drawable/dream_preview_rounded_bg.xml
+++ b/res/drawable/dream_preview_rounded_bg.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/materialColorSurfaceBright" />
+    <solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
     <corners android:radius="@dimen/dream_item_corner_radius"/>
 </shape>
\ No newline at end of file
diff --git a/res/layout/dream_preference_layout.xml b/res/layout/dream_preference_layout.xml
index f7281c1a573..aff8ad3133e 100644
--- a/res/layout/dream_preference_layout.xml
+++ b/res/layout/dream_preference_layout.xml
@@ -93,7 +93,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             android:textSize="@dimen/dream_item_summary_text_size"
-            android:textColor="@color/dream_card_text_color_state_list"
+            android:textColor="@color/dream_card_summary_color_state_list"
             app:layout_constraintTop_toBottomOf="@+id/title_text"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/dream_preview_button.xml b/res/layout/dream_preview_button.xml
index 04d272aecdd..feeb9dd36ea 100644
--- a/res/layout/dream_preview_button.xml
+++ b/res/layout/dream_preview_button.xml
@@ -17,17 +17,16 @@
 
 <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/dream_preview_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:text="@string/dream_preview_button_title"
     android:textAllCaps="false"
-    android:textColor="?android:attr/textColorPrimaryInverse"
+    android:textColor="@color/settingslib_btn_colored_text_material"
     android:theme="@style/Theme.CollapsingToolbar.Settings"
     android:layout_marginBottom="16dp"
     android:layout_gravity="bottom|center"
-    app:backgroundTint="?androidprv:attr/materialColorPrimaryContainer"
-    app:iconTint="?android:attr/textColorPrimaryInverse"
+    app:backgroundTint="@color/settingslib_btn_colored_background_material"
+    app:iconTint="@color/settingslib_btn_colored_text_material"
     app:icon="@drawable/dream_preview_icon"/>