diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-10-23 10:16:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-23 10:16:35 -0700 |
| commit | 6ada350a6fdc157a461e0141ed48ae99ca912166 (patch) | |
| tree | b76eccd118fe7eb34d3365bd79dddcf26ffbf22d /res | |
| parent | dc0df9c6c5c7aa796423b220fea33e070a9f042f (diff) | |
| parent | b3735744fdd78a2098853d58a1fef6c643e7cb50 (diff) | |
| download | packages_apps_settings-6ada350a6fdc157a461e0141ed48ae99ca912166.zip packages_apps_settings-6ada350a6fdc157a461e0141ed48ae99ca912166.tar.gz packages_apps_settings-6ada350a6fdc157a461e0141ed48ae99ca912166.tar.bz2 | |
am b3735744: Merge change I40dd2cfc into eclair
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 7 |
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 --> |