Merge "Fix background and line wrapping in CaptionTextView" into klp-dev

This commit is contained in:
Alan Viverette
2013-08-20 23:46:20 +00:00
committed by Android (Google) Code Review
5 changed files with 315 additions and 249 deletions

View File

@@ -735,11 +735,11 @@
<!-- Values for captioning font size preference. -->
<string-array name="captioning_font_size_selector_values" translatable="false" >
<item>6.0</item>
<item>12.0</item>
<item>24.0</item>
<item>32.0</item>
<item>48.0</item>
<item>72.0</item>
<item>96.0</item>
</string-array>
<!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
@@ -854,8 +854,8 @@
<!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
<string-array name="captioning_preset_selector_titles" >
<item>Black on white</item>
<item>White on black</item>
<item>Black on white</item>
<item>Yellow on black</item>
<item>Yellow on blue</item>
<item>Custom</item>