From 32bd25210452859efb1a2324c25e5aa39fe17d73 Mon Sep 17 00:00:00 2001
From: Peter_Liang <peterliang@google.com>
Date: Tue, 8 Sep 2020 13:58:22 +0800
Subject: [PATCH] Add the gray color into the palette for color correction.

Bug: 165770905
Test: manual test & make RunSettingsRoboTests ROBOTEST_FILTER=PaletteListPreferenceTest
Change-Id: I20cd795791b8265811a0972e04d7dcc5b4f2ce15
---
 res/values-night/colors.xml | 1 +
 res/values/arrays.xml       | 2 ++
 res/values/colors.xml       | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 354da77fe14..4eb0afdf1e8 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -38,6 +38,7 @@
     <color name="palette_list_color_cyan">@color/palette_list_dark_mode_color_cyan</color>
     <color name="palette_list_color_blue">@color/palette_list_dark_mode_color_blue</color>
     <color name="palette_list_color_purple">@color/palette_list_dark_mode_color_purple</color>
+    <color name="palette_list_color_gray">@color/palette_list_dark_mode_color_gray</color>
     <color name="gestures_setting_background_color">@android:color/black</color>
 </resources>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index aa11add9d28..f8df9206510 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1490,6 +1490,7 @@
         <item>@string/color_cyan</item>
         <item>@string/color_blue</item>
         <item>@string/color_purple</item>
+        <item>@string/color_gray</item>
     </string-array>
 
     <!-- Values for palette list view preference. -->
@@ -1501,6 +1502,7 @@
         <item>@color/palette_list_color_cyan</item>
         <item>@color/palette_list_color_blue</item>
         <item>@color/palette_list_color_purple</item>
+        <item>@color/palette_list_color_gray</item>
     </array>
 
     <!--String arrays for showing the rtt settings options -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ff76016f239..58b8aa4716a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -159,6 +159,7 @@
     <color name="palette_list_color_cyan">#12b5cb</color> <!-- Material Cyan 600 -->
     <color name="palette_list_color_blue">#1a73e8</color> <!-- Material Blue 600 -->
     <color name="palette_list_color_purple">#9334e6</color> <!-- Material Purple 600 -->
+    <color name="palette_list_color_gray">#80868b</color> <!-- Material Gray 600 -->
 
     <!-- Palette list preference dark mode colors. -->
     <color name="palette_list_dark_mode_color_red">#f28b82</color> <!-- Material Red 300 -->
@@ -168,6 +169,7 @@
     <color name="palette_list_dark_mode_color_cyan">#78d9ec</color> <!-- Material Cyan 300 -->
     <color name="palette_list_dark_mode_color_blue">#8AB4F8</color> <!-- Material Blue 300 -->
     <color name="palette_list_dark_mode_color_purple">#c58af9</color> <!-- Material Purple 300 -->
+    <color name="palette_list_dark_mode_color_gray">#dadce0</color> <!-- Material Gray 300 -->
 
     <!-- SIM colors -->
     <color name="SIM_color_teal">#ff00796b</color> <!-- Material Teal 700 -->