am a4c96aa2: Merge change I88bb16e6 into eclair

Merge commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0' into eclair-plus-aosp

* commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
This commit is contained in:
Jim Miller
2009-09-29 18:25:53 -07:00
committed by Android Git Automerger

View File

@@ -146,7 +146,11 @@
<!-- Display low battery warning when battery level dips to this value --> <!-- Display low battery warning when battery level dips to this value -->
<integer name="config_lowBatteryWarningLevel">15</integer> <integer name="config_lowBatteryWarningLevel">15</integer>
<!-- Close low battery warning when battery level reaches this value --> <!-- Close low battery warning when battery level reaches this value -->
<integer name="config_lowBatteryCloseWarningLevel">20</integer> <integer name="config_lowBatteryCloseWarningLevel">20</integer>
<!-- Allow the menu hard key to be disabled in LockScreen on some devices -->
<bool name="config_disableMenuKeyInLockScreen">false</bool>
</resources> </resources>