summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-08-20 23:46:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-20 23:46:20 +0000
commit35bac199324d07dd6cf16e3bd50df1feca8e9030 (patch)
tree0a0df6b9eae8f0f078e464e5d36947769591723b /res/values
parent0f5578ce2ddfc19eab36e843728470e8119026b5 (diff)
parentc30f124c917b55a93b3d4880d8d992d649a076f0 (diff)
downloadpackages_apps_Settings-35bac199324d07dd6cf16e3bd50df1feca8e9030.zip
packages_apps_Settings-35bac199324d07dd6cf16e3bd50df1feca8e9030.tar.gz
packages_apps_Settings-35bac199324d07dd6cf16e3bd50df1feca8e9030.tar.bz2
Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4498115..e58107a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -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>