am 596a4233: am 4d3a9728: Rename ro.monkey to monkey.running

Merge commit '596a4233846492ee3c3d63fd7c7cf56796960c92'

* commit '596a4233846492ee3c3d63fd7c7cf56796960c92':
  Rename ro.monkey to monkey.running
This commit is contained in:
Ying Wang
2010-01-04 13:49:30 -08:00
committed by Android Git Automerger

View File

@@ -148,7 +148,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("ro.monkey", false);
final boolean isMonkey = SystemProperties.getBoolean("monkey.running", false);
final boolean fileOverride = (new File(ENABLE_MENU_KEY_FILE)).exists();
return !configDisabled || isMonkey || fileOverride;
}