From 3b6ade0175599a0ccf14c7a6b4784e3e0bfdcced Mon Sep 17 00:00:00 2001
From: Joachim Fritzsch <joachim.fritzsch@gmail.com>
Date: Wed, 17 Apr 2013 16:39:30 +0200
Subject: [PATCH] -android: removed RAM usage when busy, not used. -android:
 reduced factory setting for ncpus_pct to 50

---
 android/BOINC/assets/global_prefs_override.xml                | 2 +-
 android/BOINC/res/values/strings.xml                          | 3 +--
 android/BOINC/src/edu/berkeley/boinc/PrefsActivity.java       | 4 ----
 .../berkeley/boinc/adapter/PrefsListItemWrapperDouble.java    | 4 ----
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/android/BOINC/assets/global_prefs_override.xml b/android/BOINC/assets/global_prefs_override.xml
index 99efec00b9..bd73dd4a91 100644
--- a/android/BOINC/assets/global_prefs_override.xml
+++ b/android/BOINC/assets/global_prefs_override.xml
@@ -8,7 +8,7 @@
   <end_hour>0.0</end_hour>
   <net_start_hour>0.0</net_start_hour>
   <net_end_hour>0.0</net_end_hour>
-  <max_ncpus_pct>100.0</max_ncpus_pct>
+  <max_ncpus_pct>50.0</max_ncpus_pct>
   <leave_apps_in_memory>0</leave_apps_in_memory>
   <dont_verify_images>0</dont_verify_images>
   <work_buf_min_days>0.1</work_buf_min_days>
diff --git a/android/BOINC/res/values/strings.xml b/android/BOINC/res/values/strings.xml
index 87f6bfaf79..f77afede11 100644
--- a/android/BOINC/res/values/strings.xml
+++ b/android/BOINC/res/values/strings.xml
@@ -160,8 +160,7 @@
 	<string name="prefs_cpu_number_cpus_header">Used CPU cores (in %)</string>
 	<string name="prefs_cpu_other_load_suspension_header">Pause when other CPU usage exceeds&#8230; (in %)</string>
 	<string name="prefs_cpu_time_max_header">CPU limit (in %)</string>
-	<string name="prefs_memory_max_busy_header">RAM limit when busy (in %)</string>
-	<string name="prefs_memory_max_idle_header">RAM limit when idle (in %)</string>
+	<string name="prefs_memory_max_idle_header">RAM limit (in %)</string>
 	
 	<!-- projects tab strings -->
 	<string name="projects_loading">Reading projects&#8230;</string>
diff --git a/android/BOINC/src/edu/berkeley/boinc/PrefsActivity.java b/android/BOINC/src/edu/berkeley/boinc/PrefsActivity.java
index 81418c2cd7..a7db189cd1 100644
--- a/android/BOINC/src/edu/berkeley/boinc/PrefsActivity.java
+++ b/android/BOINC/src/edu/berkeley/boinc/PrefsActivity.java
@@ -145,7 +145,6 @@ public class PrefsActivity extends FragmentActivity {
 		if(advanced) data.add(new PrefsListItemWrapperDouble(this,R.string.prefs_disk_max_pct_header,R.string.prefs_category_storage,clientPrefs.disk_max_used_pct));
 		if(advanced) data.add(new PrefsListItemWrapperDouble(this,R.string.prefs_disk_min_free_gb_header,R.string.prefs_category_storage,clientPrefs.disk_min_free_gb));
 		if(advanced) data.add(new PrefsListItemWrapper(this,R.string.prefs_category_memory,true));
-		if(advanced) data.add(new PrefsListItemWrapperDouble(this,R.string.prefs_memory_max_busy_header,R.string.prefs_category_memory,clientPrefs.ram_max_used_busy_frac));
 		if(advanced) data.add(new PrefsListItemWrapperDouble(this,R.string.prefs_memory_max_idle_header,R.string.prefs_category_memory,clientPrefs.ram_max_used_idle_frac));
 	}
 	
@@ -268,9 +267,6 @@ public class PrefsActivity extends FragmentActivity {
 		case R.string.prefs_cpu_other_load_suspension_header:
 			clientPrefs.suspend_cpu_usage = value;
 			break;
-		case R.string.prefs_memory_max_busy_header:
-			clientPrefs.ram_max_used_busy_frac = value;
-			break;
 		case R.string.prefs_memory_max_idle_header:
 			clientPrefs.ram_max_used_idle_frac = value;
 			break;
diff --git a/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsListItemWrapperDouble.java b/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsListItemWrapperDouble.java
index a3c46176e2..3050956182 100644
--- a/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsListItemWrapperDouble.java
+++ b/android/BOINC/src/edu/berkeley/boinc/adapter/PrefsListItemWrapperDouble.java
@@ -62,10 +62,6 @@ public class PrefsListItemWrapperDouble extends PrefsListItemWrapper {
 			header = ctx.getString(R.string.prefs_cpu_time_max_header);
 			isPct = true;
 			break;
-		case R.string.prefs_memory_max_busy_header:
-			header = ctx.getString(R.string.prefs_memory_max_busy_header);
-			isPct = true;
-			break;
 		case R.string.prefs_memory_max_idle_header:
 			header = ctx.getString(R.string.prefs_memory_max_idle_header);
 			isPct = true;