Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

This commit is contained in:
PauloftheWest
2014-10-03 22:45:26 +00:00
committed by Android (Google) Code Review
11 changed files with 349 additions and 395 deletions

View File

@@ -1265,4 +1265,22 @@
<item>Cached (activity client)</item>
<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>
</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>
</resources>

View File

@@ -75,4 +75,11 @@
<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>
</resources>

View File

@@ -204,6 +204,8 @@
<dimen name="sim_dialog_margin_bottom">16dip</dimen>
<!-- SIM Dialog padding -->
<dimen name="sim_dialog_padding">8dip</dimen>
<dimen name="sim_label_padding">16dip</dimen>
<dimen name="sim_content_padding">12dip</dimen>
<!-- Sim Card Name length -->
<integer name="sim_name_length">32</integer>

View File

@@ -5910,4 +5910,9 @@
<!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
<string name="display_auto_rotate_stay_in_current">Stay in current orientation</string>
<!-- Title and summary for SIM Status -->
<!-- Title for IMEI preference [CHAR LIMIT=30] -->
<string name="imei_information_title">IMEI information</string>
<!-- Description for IMEI preference [CHAR LIMIT=40] -->
<string name="imei_information_summary">IMEI relative information</string>
</resources>