X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=res%2Fvalues%2Farrays.xml;h=432aefef728bba1828f9c1e0aaddfeec60718b2a;hb=7a16761bf7cd60121a1f0cc78dfd7d32a372ded0;hp=7bd76a93d623451931cece4d95b8e6464d209ff7;hpb=040ad494c5560e83ab8c0414b303aa3f1e1f34bf;p=android-x86%2Fpackages-apps-Settings.git

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7bd76a93d6..432aefef72 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -56,7 +56,7 @@
         <item>2 minutes</item>
         <item>5 minutes</item>
         <item>10 minutes</item>
-        <item>30 minutes</item>
+        <item>Never time out</item>
     </string-array>
 
     <!-- Do not translate. -->
@@ -74,7 +74,7 @@
         <!-- Do not translate. -->
         <item>600000</item>
         <!-- Do not translate. -->
-        <item>1800000</item>
+        <item>604800000</item>
     </string-array>
     
     <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
@@ -149,7 +149,7 @@
         <item msgid="6490061470416867723">Small</item>
         <item msgid="3579015730662088893">Normal</item>
         <item msgid="1678068858001018666">Large</item>
-        <item msgid="490158884605093126">Extra large</item>
+        <item msgid="490158884605093126">Huge</item>
     </string-array>
 
     <string-array name="entryvalues_font_size" translatable="false">
@@ -550,20 +550,18 @@
         <item>auto</item>
     </string-array>
 
-    <!-- New incoming call vibrate options. -->
-    <string-array name="vibrate_entries">
-        <item>Always</item>
-        <item>Never</item>
-        <item>Only in Silent mode</item>
-        <item>Only when not in Silent mode</item>
+    <!-- Silent mode options. -->
+    <string-array name="silent_mode_entries">
+        <item>Off</item>
+        <item>Vibrate</item>
+        <item>Mute</item>
     </string-array>
 
-    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-    <string-array name="vibrate_values" translatable="false">
-        <item>always</item>
-        <item>never</item>
-        <item>silent</item>
-        <item>notsilent</item>
+    <!-- Values for Silent mode. Do not translate. -->
+    <string-array name="silent_mode_values" translatable="false">
+        <item>off</item>
+        <item>vibrate</item>
+        <item>mute</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
@@ -604,6 +602,30 @@
         <item>Always use HDCP checking</item>
     </string-array>
 
+    <!-- Titles for hardware keyboard layout preference. -->
+    <string-array name="hardware_keyboard_layout_titles">
+        <item>Use system language</item>
+        <item>English</item>
+        <item>French</item>
+        <item>German</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Russian</item>
+        <item>Spanish (Spain)</item>
+    </string-array>
+
+    <!-- Values for hardware keyboard layout preference. -->
+    <string-array name="hardware_keyboard_layout_keys" translatable="false" >
+        <item>sys</item>
+        <item>en</item>
+        <item>fr</item>
+        <item>de</item>
+        <item>it</item>
+        <item>ja</item>
+        <item>ru</item>
+        <item>es_ES</item>
+    </string-array>
+
     <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
     <string-array name="window_animation_scale_entries">
         <item>Animation off</item>