am 27517b21: Still use ro.monkey

Merge commit '27517b2158a7fcdae13ff02d4cbefa79afbdb838' into eclair-plus-aosp

* commit '27517b2158a7fcdae13ff02d4cbefa79afbdb838':
  Still use ro.monkey
This commit is contained in:
Ying Wang
2010-01-06 13:46:00 -08:00
committed by Android Git Automerger

View File

@@ -147,7 +147,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
private boolean shouldEnableMenuKey() {
final Resources res = getResources();
final boolean configDisabled = res.getBoolean(R.bool.config_disableMenuKeyInLockScreen);
final boolean isMonkey = SystemProperties.getBoolean("monkey.running", false);
final boolean isMonkey = SystemProperties.getBoolean("ro.monkey", false);
final boolean fileOverride = (new File(ENABLE_MENU_KEY_FILE)).exists();
return !configDisabled || isMonkey || fileOverride;
}