summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-01-04 12:04:25 -0800
committerYing Wang <wangying@google.com>2010-01-04 12:04:25 -0800
commit50cb76f58554dbccc51a754a73abef2debd8b721 (patch)
tree496655d58aed4d549cee9e36cfe4b79a775aa91b
parentd8eec52a3786a51b38ed280afd84005e6da05ce6 (diff)
downloadpackages_apps_settings-50cb76f58554dbccc51a754a73abef2debd8b721.zip
packages_apps_settings-50cb76f58554dbccc51a754a73abef2debd8b721.tar.gz
packages_apps_settings-50cb76f58554dbccc51a754a73abef2debd8b721.tar.bz2
Rename ro.monkey to monkey.running
So that Monkey can set it before running and reset it after running.
-rw-r--r--src/com/android/settings/DevelopmentSettings.java4
-rw-r--r--src/com/android/settings/LanguageSettings.java2
-rw-r--r--src/com/android/settings/MasterClear.java6
-rw-r--r--src/com/android/settings/MediaFormat.java6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 753f9b9..7934800 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -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;
}
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java
index 4b805ed..2f1bd2c 100644
--- a/src/com/android/settings/LanguageSettings.java
+++ b/src/com/android/settings/LanguageSettings.java
@@ -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;
}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 38ad608..6cd8ad3 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -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) {
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index 3594572..870507f 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -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 =