diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2014-10-30 11:05:55 -0700 |
|---|---|---|
| committer | Sanket Padawe <sanketpadawe@google.com> | 2014-10-30 11:05:55 -0700 |
| commit | 197976e6d105f40742d4fbcd7893e497bef433b2 (patch) | |
| tree | e974f17f1b21edf4feac2aefa6eaa2647ee74b0f /res/values/arrays.xml | |
| parent | abe1ad74a18930ebf8704d9587a3415a08115b1f (diff) | |
| parent | 4e4a3f896319bdbe941bc7a6b87cad95b764498a (diff) | |
| download | packages_apps_Settings-197976e6d105f40742d4fbcd7893e497bef433b2.zip packages_apps_Settings-197976e6d105f40742d4fbcd7893e497bef433b2.tar.gz packages_apps_Settings-197976e6d105f40742d4fbcd7893e497bef433b2.tar.bz2 | |
resolve merge conflicts of 4e4a3f8 to master.
Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 34 |
1 files changed, 18 insertions, 16 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"> |