diff options
| author | 2014-11-05 20:30:28 +0000 | |
|---|---|---|
| committer | 2014-11-05 20:30:30 +0000 | |
| commit | d12b69518daabff3c13482f4b5140020b747b71f (patch) | |
| tree | 2354e11e209453fa8ea1a5b3f7ea9d8502078f9a | |
| parent | fbc3bdec7a2a80e8c3f1cdfebaecc6dba82c9cc6 (diff) | |
| parent | 3e0bb7b7be1d48fe8be9e4ab78a849ff29713e80 (diff) | |
Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev
| -rw-r--r-- | core/res/res/values/arrays.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 15 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index bb9885c9d890..f6a5787a9697 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -441,4 +441,13 @@ <item>中文 (繁體)</item> </string-array> + <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> + </resources> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 9f83db4909e7..b9825c534705 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -160,5 +160,18 @@ <color name="user_icon_8">#ffff5722</color><!-- deep orange 500 --> <color name="user_icon_default_gray">#ff9e9e9e</color><!-- gray 500 --> <color name="user_icon_default_white">#ffffffff</color><!-- white --> -</resources> + <!-- Multi-sim sim colors --> + <color name="Teal_700">#ff00796b</color> + <color name="Teal_800">#ff00695c</color> + <color name="Blue_700">#ff3367d6</color> + <color name="Blue_800">#ff2a56c6</color> + <color name="Indigo_700">#ff303f9f</color> + <color name="Indigo_800">#ff283593</color> + <color name="Purple_700">#ff7b1fa2</color> + <color name="Purple_800">#ff6a1b9a</color> + <color name="Pink_700">#ffc2185b</color> + <color name="Pink_800">#ffad1457</color> + <color name="Red_700">#ffc53929</color> + <color name="Red_800">#ffb93221</color> +</resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index db3ced1ce9c5..6e881a710469 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1073,6 +1073,7 @@ <java-symbol type="array" name="networkAttributes" /> <java-symbol type="array" name="preloaded_color_state_lists" /> <java-symbol type="array" name="preloaded_drawables" /> + <java-symbol type="array" name="sim_colors" /> <java-symbol type="array" name="special_locale_codes" /> <java-symbol type="array" name="special_locale_names" /> <java-symbol type="array" name="config_masterVolumeRamp" /> |