PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 50cb76f5: Rename ro.monkey to monkey.running

Browse Source 
Merge commit '50cb76f58554dbccc51a754a73abef2debd8b721' into eclair-plus-aosp

* commit '50cb76f58554dbccc51a754a73abef2debd8b721':
  Rename ro.monkey to monkey.running
This commit is contained in:
Ying Wang
2010-01-04 12:58:54 -08:00
committed by Android Git Automerger
parent f4ec356df9 50cb76f585
commit e0415214c8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/DevelopmentSettings.java
View File

@@ -62,7 +62,7 @@ public class DevelopmentSettings extends PreferenceActivity
@Override
protected void onResume() {
super.onResume();
mEnableAdb.setChecked(Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ADB_ENABLED, 0) != 0);
mKeepScreenOn.setChecked(Settings.System.getInt(getContentResolver(),
@@ -76,7 +76,7 @@ public class DevelopmentSettings extends PreferenceActivity
// Those monkeys kept committing suicide, so we add this property
// to disable this functionality
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
return false;
}

2
src/com/android/settings/LanguageSettings.java
View File

@@ -206,7 +206,7 @@ public class LanguageSettings extends PreferenceActivity {
// Input Method stuff
// Those monkeys kept committing suicide, so we add this property
// to disable this functionality
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
return false;
}

6
src/com/android/settings/MasterClear.java
View File

@@ -60,13 +60,13 @@ public class MasterClear extends Activity {
*/
private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
public void onClick(View v) {
// Those monkeys kept committing suicide, so we add this property
// to disable going through with the master clear
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
return;
}
ICheckinService service =
ICheckinService.Stub.asInterface(ServiceManager.getService("checkin"));
if (service != null) {

6
src/com/android/settings/MediaFormat.java
View File

@@ -54,16 +54,16 @@ public class MediaFormat extends Activity {
private View mFinalView;
private Button mFinalButton;
/**
/**
* The user has gone through the multiple confirmation, so now we go ahead
* and invoke the Mount Service to format the SD card.
*/
private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
public void onClick(View v) {
// Those monkeys kept committing suicide, so we add this property
// to disable going through with the format
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
return;
}
IMountService service =