am 11cc925e: am a4c96aa2: Merge change I88bb16e6 into eclair

Merge commit '11cc925efbe582d617ffd01894f920f9a675adc3'

* commit '11cc925efbe582d617ffd01894f920f9a675adc3':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
This commit is contained in:
Jim Miller
2009-10-01 11:46:25 -07:00
committed by Android Git Automerger

View File

@@ -146,7 +146,11 @@
<!-- Display low battery warning when battery level dips to this value -->
<integer name="config_lowBatteryWarningLevel">15</integer>
<!-- Close low battery warning when battery level reaches this value -->
<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>