diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-05-21 08:40:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 08:40:33 +0000 |
| commit | fcc4fed3c16a57ef713a96b7298ed43aaeef2df4 (patch) | |
| tree | 6c6307b9e734caed7bdeb3c983bba895fc2900f9 /core/res | |
| parent | 1d265716954122f79d5fdd9d953a98e303d298c9 (diff) | |
| parent | 6fb904bfd1f943547d6e5bc6f199ffec2290da01 (diff) | |
| download | frameworks_base-fcc4fed3c16a57ef713a96b7298ed43aaeef2df4.zip frameworks_base-fcc4fed3c16a57ef713a96b7298ed43aaeef2df4.tar.gz frameworks_base-fcc4fed3c16a57ef713a96b7298ed43aaeef2df4.tar.bz2 | |
am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index dd13db0..99be34a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -485,6 +485,14 @@ --> <integer name="config_longPressOnPowerBehavior">1</integer> + <!-- Control the behavior when the user short presses the power button. + 0 - Nothing + 1 - Go to sleep (doze) + 2 - Really go to sleep (don't doze) + 3 - Really go to sleep and go home (don't doze) + --> + <integer name="config_shortPressOnPowerBehavior">1</integer> + <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] --> <string name="widget_default_package_name"></string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 29ac8de..5b2b394 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -304,6 +304,7 @@ <java-symbol type="integer" name="config_ntpRetry" /> <java-symbol type="integer" name="config_ntpThreshold" /> <java-symbol type="integer" name="config_ntpTimeout" /> + <java-symbol type="integer" name="config_shortPressOnPowerBehavior" /> <java-symbol type="integer" name="config_toastDefaultGravity" /> <java-symbol type="integer" name="config_wifi_framework_scan_interval" /> <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" /> |