PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
This commit is contained in:
Betty Chang
2021-09-06 04:16:51 +00:00
committed by Automerger Merge Worker
parent 6e55a559d4 ebdc0e26f6
commit 3b1c25573b
4 changed files with 95 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/values/arrays.xml
View File

@@ -1179,14 +1179,24 @@
<item>Cached (empty)</item>
</string-array>
<!-- Array of color for sim color for multi-sim in light mode -->
<string-array name="sim_color_light">
<item>@color/SIM_color_cyan</item>
<item>@color/SIM_color_blue800</item>
<item>@color/SIM_color_green800</item>
<item>@color/SIM_color_purple800</item>
<item>@color/SIM_color_pink800</item>
<item>@color/SIM_color_orange</item>
</string-array>
<!-- Array of titles for sim color for multi-sim -->
<string-array name="color_picker">
<item>Teal</item>
<item>Cyan</item>
<item>Blue</item>
<item>Indigo</item>
<item>Green</item>
<item>Purple</item>
<item>Pink</item>
<item>Red</item>
<item>Orange</item>
</string-array>
<!-- Automatic storage management settings. The amount of days for the automatic storage manager

20
res/values/colors.xml
View File

@@ -184,13 +184,21 @@
<color name="SIM_color_pink">#ffc2185b</color> <!-- Material Pink 700 -->
<color name="SIM_color_red">#ffd32f2f</color> <!-- Material Red 700 -->
<!-- SIM colors updated for GAR -->
<color name="SIM_color_cyan">#ff006D74</color> <!-- Material Custom Cyan -->
<color name="SIM_color_blue800">#ff185ABC</color> <!-- Material Blue 800 -->
<color name="SIM_color_green800">#ff137333</color> <!-- Material Green 800 -->
<color name="SIM_color_purple800">#ff7627bb</color> <!-- Material Purple 800 -->
<color name="SIM_color_pink800">#ffb80672</color> <!-- Material Pink 800 -->
<color name="SIM_color_orange">#ff995400</color> <!-- Material Custom Orange -->
<!-- Dark mode SIM colors -->
<color name="SIM_dark_mode_color_teal">#ff80cbc4</color> <!-- Material Teal 200 -->
<color name="SIM_dark_mode_color_blue">#ff90caf9</color> <!-- Material Blue 200 -->
<color name="SIM_dark_mode_color_indigo">#ffc5cae9</color> <!-- Material Indigo 100 -->
<color name="SIM_dark_mode_color_purple">#ffe1bee7</color> <!-- Material Purple 100 -->
<color name="SIM_dark_mode_color_pink">#fff48fb1</color> <!-- Material Pink 200 -->
<color name="SIM_dark_mode_color_red">#ffef9a9a</color> <!-- Material Red 200 -->
<color name="SIM_dark_mode_color_cyan">#ff4DD0E1</color> <!-- Material Cyan 300 -->
<color name="SIM_dark_mode_color_blue">#ff8AB4F8</color> <!-- Material Blue 300 -->
<color name="SIM_dark_mode_color_green">#ff81C995</color> <!-- Material Green 300 -->
<color name="SIM_dark_mode_color_purple">#ffC58AF9</color> <!-- Material Purple 300 -->
<color name="SIM_dark_mode_color_pink">#ffff8bcb</color> <!-- Material Pink 300 -->
<color name="SIM_dark_mode_color_orange">#fffcad70</color> <!-- Material Orange 300 -->
<!-- Top app bar colors -->
<color name="color_surface_header">@*android:color/surface_header_light</color>