Improve running services to services managed by the system.

Also a little tweak to the animations preference.

Change-Id: I3183ef21e687a3b120d02c79e7388300084b9202

4 files changed, 57 insertions, 24 deletions

diff --git a/res/layout/running_services_item.xml b/res/layout/running_services_item.xml
index 6748a1a..2728c76 100644
--- a/res/layout/running_services_item.xml
+++ b/res/layout/running_services_item.xml
@@ -50,30 +50,21 @@
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
-            <TextView android:id="@+id/name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:layout_marginBottom="2dip" />
             <LinearLayout
                 android:orientation="horizontal"
+                android:baselineAlignedChildIndex="0"
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-                <TextView android:id="@+id/run_time"
-                    android:layout_marginTop="-4dip"
-                    android:layout_gravity="center_vertical|left"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                android:layout_height="wrap_content">
+	            <TextView android:id="@+id/name"
+	                android:layout_width="wrap_content"
+	                android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
-                    android:singleLine="true"
-                    android:ellipsize="marquee"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+	                android:textAppearance="?android:attr/textAppearanceMedium"
+	                android:textStyle="bold"
+	                android:singleLine="true"
+	                android:ellipsize="marquee"
+	                android:layout_marginBottom="2dip" />
                 <TextView android:id="@+id/size"
-                    android:layout_marginTop="-4dip"
                     android:layout_gravity="center_vertical|right"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -81,6 +72,15 @@
                     android:singleLine="true"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
             </LinearLayout>
+                <TextView android:id="@+id/description"
+                    android:layout_marginTop="-4dip"
+                    android:layout_gravity="center_vertical|left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingRight="4dip"
+                    android:singleLine="true"
+                    android:ellipsize="marquee"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 82f7d5e..bb786c2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -48,6 +48,34 @@
         <item>yyyy-MM-dd</item>
     </string-array>
 
+    <!-- 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>
+    </string-array>
+
+    <!-- Display settings.  Summary for each type of animation. -->
+    <string-array name="animations_summaries">
+        <item>No window animations are shown</item>
+        <item>Some window animations are shown</item>
+        <item>All window animations are shown</item>
+        <item>Slower window animations are shown</item>
+    </string-array>
+
+    <!-- Do not translate. -->
+    <string-array name="animations_values">
+        <!-- Do not translate. -->
+        <item>00</item>
+        <!-- Do not translate. -->
+        <item>01</item>
+        <!-- Do not translate. -->
+        <item>11</item>
+        <!-- Do not translate. -->
+        <item>22</item>
+    </string-array>
+
     <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown ain a list dialog. -->
     <string-array name="screen_timeout_entries">
         <item>15 seconds</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a73f910..9043dba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1421,6 +1421,10 @@ found in the list of installed applications.</string>
     <string name="confirm_stop_stop">Stop</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>
+    <!-- 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>
     
     <!-- 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 -->
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 639204a..1d5e66a 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -110,11 +110,12 @@
             android:summaryOn="@string/accelerometer_summary_on"
             android:summaryOff="@string/accelerometer_summary_off"/>
     
-        <CheckBoxPreference
-                android:key="animations"
-                android:title="@string/animations_title"
-                android:summaryOn="@string/animations_summary_on"
-                android:summaryOff="@string/animations_summary_off" />
+	    <ListPreference
+	        android:key="animations"
+	        android:title="@string/animations_title" 
+            android:persistent="false"
+            android:entries="@array/animations_entries"
+            android:entryValues="@array/animations_values" />
 
         <com.android.settings.BrightnessPreference
                 android:key="brightness"