From 83b09a57e158f3050c7feb5ea75e8dd2d626697e Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 13 Jul 2011 19:36:06 -0700
Subject: Various small fixes to the debugging settings.

Also tweak to follow changes in activity manager.

Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
---
 res/values/arrays.xml  | 12 ++++++++----
 res/values/strings.xml |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 157a6c4..45f7fd8 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -635,18 +635,22 @@
 
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
-        <item>No app process limit</item>
-        <item>Max 1 app process</item>
-        <item>Max 2 app processes</item>
-        <item>Max 3 app processes</item>
+        <item>Standard limit</item>
+        <item>No background processes</item>
+        <item>At most 1 process</item>
+        <item>At most 2 processes</item>
+        <item>At most 3 processes</item>
+        <item>At most 4 processes</item>
     </string-array>
 
     <!-- Values for app process limit preference. -->
     <string-array name="app_process_limit_values" translatable="false" >
+        <item>-1</item>
         <item>0</item>
         <item>1</item>
         <item>2</item>
         <item>3</item>
+        <item>4</item>
     </string-array>
 
     <!-- Match this with the constants in VpnProfile. --> <skip />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90f3c3f..3719f73 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3340,13 +3340,13 @@ found in the list of installed applications.</string>
     <string name="debug_applications_category">Applications</string>
 
     <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
-    <string name="immediately_destroy_activities">Immediately destroy activities</string>
+    <string name="immediately_destroy_activities">Don\'t keep activities</string>
     <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
     <string name="immediately_destroy_activities_summary">Destroy every activity as soon as
             the user leaves it</string>
 
-    <!-- UI debug setting: limit number of running application processes [CHAR LIMIT=25] -->
-    <string name="app_process_limit_title">Application process limit</string>
+    <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+    <string name="app_process_limit_title">Background process limit</string>
 
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
-- 
cgit v1.1