resolve merge conflicts of 4e4a3f8 to master.

Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d

3 files changed, 28 insertions, 22 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c21cbdb..dfa4c42 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1260,24 +1260,26 @@
         <item>Cached (empty)</item>
     </string-array>
 
-    <!-- Multi-SIM titles for captioning color preference. -->
-    <string-array name="sim_info_picker_color_titles" translatable="false" >
-        <item>@string/color_blue</item>
-        <item>@string/color_green</item>
-        <item>@string/color_purple</item>
-        <item>@string/color_red</item>
-        <item>@string/color_orange</item>
+    <!-- Array storing rgb values of sim colors for multi-sim -->
+    <array name="sim_colors">
+        <item>@color/Teal_700</item>
+        <item>@color/Blue_700</item>
+        <item>@color/Indigo_700</item>
+        <item>@color/Purple_700</item>
+        <item>@color/Pink_700</item>
+        <item>@color/Red_700</item>
+    </array>
+
+    <!-- Array of titles for sim color for multi-sim -->
+    <string-array name="color_picker">
+        <item>Teal</item>
+        <item>Blue</item>
+        <item>Indigo</item>
+        <item>Purple</item>
+        <item>Pink</item>
+        <item>Red</item>
     </string-array>
 
-    <!-- Multi-SIM colors. -->
-    <integer-array name="sim_info_picker_color_values" translatable="false" >
-        <item>@color/blue_500</item>
-        <item>@color/green_500</item>
-        <item>@color/purple_500</item>
-        <item>@color/red_500</item>
-        <item>@color/orange_500</item>
-    </integer-array>
-
     <!-- USB configuration names for Developer Settings.
          This can be overridden by devices with additional USB configurations. -->
     <string-array name="usb_configuration_titles">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index da54c3e..5ccae84 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -75,11 +75,13 @@
 
     <color name="wifi_divider">#ffe0e0e0</color>
 
-    <!-- Multi-SIM colors -->
-    <color name="blue_500">#5677fc</color>
-    <color name="green_500">#259b24</color>
-    <color name="purple_500">#9c27b0</color>
-    <color name="red_500">#e51c23</color>
-    <color name="orange_500">#ff9800</color>
+    <!-- Multi-SIM colors Todo: To check whether to append 00 or FF before color values-->
+    <color name="Teal_700">#0000796b</color>
+    <color name="Blue_700">#003367d6</color>
+    <color name="Indigo_700">#00303f9f</color>
+    <color name="Purple_700">#007b1fa2</color>
+    <color name="Pink_700">#00c2185b</color>
+    <color name="Red_700">#00c53929</color>
+
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ace2c9c..d0a8156 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3639,6 +3639,8 @@
     <!-- Label for the default device locale. [CHAR LIMIT=35] -->
     <string name="locale_default">Default</string>
 
+    <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+    <string name = "color_title">Color</string>
     <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
     <string name="color_unspecified">Default</string>
     <!-- Label for no color (transparent). [CHAR LIMIT=35] -->