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

Merge "Add the gray color into the palette for color correction." am: 0f61d2aa31

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

Change-Id: I76da6fe8fbaee7bba5a3a41dd0e7b4c243e050ce
This commit is contained in:
PETER LIANG
2020-09-09 09:52:23 +00:00
committed by Automerger Merge Worker
parent 7444faf9ad 0f61d2aa31
commit 1bf4a12e9d
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-night/colors.xml
View File

@@ -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>

2
res/values/arrays.xml
View File

@@ -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 -->

2
res/values/colors.xml
View File

@@ -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 -->