resolved conflicts for merge of c2c64a31 to master

[android-x86/packages-apps-Settings.git] / res / values / arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7e094d4..0708163 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -469,20 +469,8 @@
         <item>None</item>
         <!-- Manual HTTP proxy settings are used for the current wifi network [CHAR LIMIT=25] -->
         <item>Manual</item>
-    </string-array>
-
-    <!-- Sound settings for emergency tone. -->
-    <string-array name="emergency_tone_entries">
-        <item>Off</item>
-        <item>Alert</item>
-        <item>Vibrate</item>
-    </string-array>
-
-    <!-- Do not translate. -->
-    <string-array name="emergency_tone_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
+        <!-- Proxy Auto-Config URL that is used for the current wifi network [CHAR LIMIT=25] -->
+        <item>Proxy Auto-Config</item>
     </string-array>
 
     <!-- Locales in this list are displayed with the corresponding
@@ -713,6 +701,9 @@
         <item>Sans-serif condensed</item>
         <item>Serif</item>
         <item>Monospace</item>
+        <item>Casual</item>
+        <item>Cursive</item>
+        <item>Small capitals</item>
     </string-array>
 
     <!-- Values for captioning typeface preference. -->
@@ -722,6 +713,9 @@
         <item>sans-serif-condensed</item>
         <item>serif</item>
         <item>monospace</item>
+        <item>casual</item>
+        <item>cursive</item>
+        <item>sans-serif-smallcaps</item>
     </string-array>
 
     <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
@@ -744,20 +738,27 @@
 
     <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
     <string-array name="captioning_edge_type_selector_titles">
+        <item>Default</item>
         <item>None</item>
         <item>Outline</item>
         <item>Drop shadow</item>
+        <item>Raised</item>
+        <item>Depressed</item>
     </string-array>
 
     <!-- Values for captioning character edge type preference. -->
     <integer-array name="captioning_edge_type_selector_values" translatable="false" >
+        <item>-1</item>
         <item>0</item>
         <item>1</item>
         <item>2</item>
+        <item>3</item>
+        <item>4</item>
     </integer-array>
 
     <!-- Titles for captioning color preference. -->
     <string-array name="captioning_color_selector_titles" translatable="false" >
+        <item>@string/color_unspecified</item>
         <item>@string/color_white</item>
         <item>@string/color_black</item>
         <item>@string/color_red</item>
@@ -770,6 +771,7 @@
 
     <!-- Values for captioning color preference. -->
     <integer-array name="captioning_color_selector_values" translatable="false" >
+        <item>0x00000100</item>
         <item>0xFFFFFFFF</item>
         <item>0xFF000000</item>
         <item>0xFFFF0000</item>
@@ -854,6 +856,7 @@
 
     <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
     <string-array name="captioning_preset_selector_titles" >
+        <item>Use app defaults</item>
         <item>White on black</item>
         <item>Black on white</item>
         <item>Yellow on black</item>
@@ -863,6 +866,7 @@
 
     <!-- Values for captioning text style preset preference. -->
     <integer-array name="captioning_preset_selector_values" translatable="false" >
+        <item>4</item>
         <item>0</item>
         <item>1</item>
         <item>2</item>
@@ -1063,7 +1067,6 @@
     <string-array name="track_frame_time_entries">
         <item>Off</item>
         <item>On screen as bars</item>
-        <item>On screen as lines</item>
         <item>In adb shell dumpsys gfxinfo</item>
     </string-array>
 
@@ -1071,7 +1074,6 @@
     <string-array name="track_frame_time_values" translatable="false" >
         <item>false</item>
         <item>visual_bars</item>
-        <item>visual_lines</item>
         <item>true</item>
     </string-array>
 
@@ -1080,7 +1082,6 @@
         <item>Off</item>
         <item>Show overdraw areas</item>
         <item>Show areas for Deuteranomaly</item>
-        <item>Show overdraw counter</item>
     </string-array>
 
     <!-- Values for debug overdraw preference. -->
@@ -1088,7 +1089,6 @@
         <item>false</item>
         <item>show</item>
         <item>show_deuteranomaly</item>
-        <item>count</item>
     </string-array>
 
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
@@ -1190,4 +1190,70 @@
         <item>critical</item>
     </string-array>
 
+    <!-- Display color space adjustment modes for accessibility -->
+    <string-array name="daltonizer_type_entries" translatable="false">
+        <item>@string/daltonizer_mode_deuteranomaly</item>
+        <item>@string/daltonizer_mode_protanomaly</item>
+        <item>@string/daltonizer_mode_tritanomaly</item>
+        <item>@string/daltonizer_mode_deuteranopia</item>
+        <item>@string/daltonizer_mode_protanopia</item>
+        <item>@string/daltonizer_mode_tritanopia</item>
+    </string-array>
+
+    <!-- Values for display color space adjustment modes for accessibility -->
+    <string-array name="daltonizer_type_values" translatable="false">
+        <item>12</item>
+        <item>11</item>
+        <item>13</item>
+        <item>15</item>
+        <item>14</item>
+        <item>16</item>
+    </string-array>
+
+    <!-- Display color space adjustment modes for developers -->
+    <string-array name="simulate_color_space_entries" translatable="false">
+        <item>@string/daltonizer_mode_disabled</item>
+        <item>@string/daltonizer_mode_monochromacy</item>
+        <item>@string/daltonizer_mode_deuteranomaly</item>
+        <item>@string/daltonizer_mode_protanomaly</item>
+        <item>@string/daltonizer_mode_tritanomaly</item>
+        <item>@string/daltonizer_mode_deuteranopia</item>
+        <item>@string/daltonizer_mode_protanopia</item>
+        <item>@string/daltonizer_mode_tritanopia</item>
+    </string-array>
+
+    <!-- Values for display color space adjustment modes for developers -->
+    <string-array name="simulate_color_space_values" translatable="false">
+        <item>-1</item>
+        <item>0</item>
+        <item>2</item>
+        <item>1</item>
+        <item>3</item>
+        <item>5</item>
+        <item>4</item>
+        <item>6</item>
+    </string-array>
+
+    <!-- Setting display values for zen mode -->
+    <string-array name="entries_zen_mode">
+        <item>Off</item>
+        <item>Limited interruptions</item>
+        <item>Zero interruptions</item>
+    </string-array>
+
+    <!-- Setting values for zen mode, must match the Settings.Global.ZEN_MODE_ constants -->
+    <string-array name="entryvalues_zen_mode" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Battery saver mode: allowable trigger threshold levels. -->
+    <integer-array name="battery_saver_trigger_values" translatable="false" >
+        <item>0</item>
+        <item>5</item>
+        <item>10</item>
+        <item>15</item>
+        <item>20</item>
+    </integer-array>
 </resources>