Merge change 24553 into eclair

* changes:
  Make running services show dependent processes.

3 files changed, 51 insertions, 17 deletions

diff --git a/res/layout/running_services.xml b/res/layout/running_services.xml
index 8fe7f9f..120a113 100644
--- a/res/layout/running_services.xml
+++ b/res/layout/running_services.xml
@@ -15,16 +15,46 @@
  * limitations under the License.
  -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ListView android:id="@android:id/list"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent"
-            android:drawSelectorOnTop="false"
-            android:fastScrollEnabled="true" />
-    <TextView android:id="@android:id/empty"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:orientation="vertical">
+    <FrameLayout
+		    android:layout_width="fill_parent"
+		    android:layout_height="0px"
+		    android:layout_weight="1">
+	    <ListView android:id="@android:id/list"
+	            android:layout_width="fill_parent" 
+	            android:layout_height="fill_parent"
+	            android:drawSelectorOnTop="false"
+	            android:fastScrollEnabled="true" />
+	    <TextView android:id="@android:id/empty"
+	            android:layout_width="fill_parent"
+	            android:layout_height="fill_parent"
+	            android:gravity="center"
+	            android:text="@string/no_running_services"
+	            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </FrameLayout>
+    <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:gravity="center"
-            android:text="@string/no_running_services"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-</merge>
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:background="?android:attr/colorForeground"
+            android:padding="4dp">
+        <TextView android:id="@+id/backgroundText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceSmallInverse"
+            android:color="?android:attr/textColorPrimaryInverse"
+            android:singleLine="true" />
+        <TextView android:id="@+id/foregroundText"
+            android:layout_gravity="center_vertical|right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textAppearance="?android:attr/textAppearanceSmallInverse"
+            android:color="?android:attr/textColorPrimaryInverse"
+            android:singleLine="true" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index bb786c2..8dadc54 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -50,10 +50,10 @@
 
     <!-- Display settings.  The type of animations to show. -->
     <string-array name="animations_entries">
-        <item>Off</item>
-        <item>Some</item>
-        <item>All</item>
-        <item>Slow</item>
+        <item>No animations</item>
+        <item>Some animations</item>
+        <item>All animations</item>
+        <item>Slower all animations</item>
     </string-array>
 
     <!-- Display settings.  Summary for each type of animation. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 847e879..4d89630 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1422,9 +1422,13 @@ found in the list of installed applications.</string>
     <!-- Running services, button to cancel stopping of a service -->
     <string name="confirm_stop_cancel">Cancel</string>
     <!-- Running services, description for a service in the started state -->
-    <string name="service_started_by_app">Started by application</string>
+    <string name="service_started_by_app">Started by application: select to stop</string>
     <!-- Running services, description for a service in the started state -->
     <string name="service_client_name"><xliff:g id="client_name">%1$s</xliff:g>: select to manage</string>
+    <!-- Running services, summary of background processes -->
+    <string name="service_background_processes">Background procs: <xliff:g id="client_name">%1$d</xliff:g></string>
+    <!-- Running services, summary of foreground processes -->
+    <string name="service_foreground_processes">Foreground procs: <xliff:g id="client_name">%1$d</xliff:g></string>
     
     <!-- Language Settings --> <skip />
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->