summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2009-10-22 20:57:32 -0700
committerAmith Yamasani <yamasani@google.com>2009-10-22 20:57:32 -0700
commit40dd2cfcfd3ff24320beef87ce4ab6fb1e530d10 (patch)
treee9c758340bcd2811fd1dff8ac59fa99b1f5e4cec /res
parent8355d9343455eaacf559f0df0e752f236b7464d2 (diff)
downloadpackages_apps_settings-40dd2cfcfd3ff24320beef87ce4ab6fb1e530d10.zip
packages_apps_settings-40dd2cfcfd3ff24320beef87ce4ab6fb1e530d10.tar.gz
packages_apps_settings-40dd2cfcfd3ff24320beef87ce4ab6fb1e530d10.tar.bz2
Fix for 2202408: Replace Never Timeout with 30 minutes
Maximum timeout is now 30 minutes. Never Timeout will cause burn-in problems with OLED and a bit with LCD as well.
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5191d83..6d8ca32 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -79,12 +79,11 @@
<item>1 minute</item>
<item>2 minutes</item>
<item>10 minutes</item>
- <!-- Choosing this means the screen will only turn off after the user manually does so. There will be no inactivity check. -->
- <item>Never timeout</item>
+ <item>30 minutes</item>
</string-array>
<!-- Do not translate. -->
- <string-array name="screen_timeout_values">
+ <string-array name="screen_timeout_values" translatable="false">
<!-- Do not translate. -->
<item>15000</item>
<!-- Do not translate. -->
@@ -96,7 +95,7 @@
<!-- Do not translate. -->
<item>600000</item>
<!-- Do not translate. -->
- <item>-1</item>
+ <item>1800000</item>
</string-array>
<!-- TTS settings -->