diff options
| author | Erik Pasternak <roboerik@android.com> | 2014-10-02 13:46:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 13:46:34 +0000 |
| commit | fcdd68709296ab084436b34b381578d57c5d3f87 (patch) | |
| tree | ec2727c9598ee4260381a17486098631bf5d5d71 /packages/SettingsProvider/res | |
| parent | 772d614a8ddf697f2841dd686a2f8badfb0059b7 (diff) | |
| parent | c7cbbe8e82b2dda4889a6663a83586f1e6759282 (diff) | |
| download | frameworks_base-fcdd68709296ab084436b34b381578d57c5d3f87.zip frameworks_base-fcdd68709296ab084436b34b381578d57c5d3f87.tar.gz frameworks_base-fcdd68709296ab084436b34b381578d57c5d3f87.tar.bz2 | |
am c7cbbe8e: am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit 'c7cbbe8e82b2dda4889a6663a83586f1e6759282':
Implement auto-sleep functionality.
Diffstat (limited to 'packages/SettingsProvider/res')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 934ed38..efba03d 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -19,6 +19,7 @@ <resources> <bool name="def_dim_screen">true</bool> <integer name="def_screen_off_timeout">60000</integer> + <integer name="def_sleep_timeout">-1</integer> <bool name="def_airplane_mode_on">false</bool> <!-- Comma-separated list of bluetooth, wifi, and cell. --> <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi,nfc,wimax</string> |