PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f0fed9dc: am b3735744: Merge change I40dd2cfc into eclair

Browse Source 
Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp

* commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be':
  Fix for 2202408: Replace Never Timeout with 30 minutes
This commit is contained in:
Amith Yamasani
2009-10-26 14:28:13 -07:00
committed by Android Git Automerger
parent c342f09345 f0fed9dc87
commit 32ac210016
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/arrays.xml
View File

@@ -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 -->