Minor UI improvements and showing of unplugged duration.

5 files changed, 16 insertions, 10 deletions

diff --git a/res/drawable/app_gauge.9.png b/res/drawable/app_gauge.9.png
index f8ff669..f6c7c99 100644
--- a/res/drawable/app_gauge.9.png
+++ b/res/drawable/app_gauge.9.png
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 097469b..7ea2432 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -27,8 +27,9 @@
         android:textStyle="bold"
         android:singleLine="true"
         android:layout_alignParentLeft="true"
-        android:layout_marginBottom="2dip"
-        android:layout_marginTop="2dip" />
+        android:layout_marginBottom="4dip"
+        android:layout_marginTop="4dip"
+        android:layout_marginLeft="4dip" />
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
@@ -37,7 +38,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="normal"
         android:singleLine="true"
-        android:layout_marginBottom="2dip"
-        android:layout_marginTop="2dip"
-        android:layout_marginRight="4dip"/>
+        android:layout_marginBottom="4dip"
+        android:layout_marginTop="4dip"
+        android:layout_marginRight="10dip"/>
 </RelativeLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 206eb05..8aa625f 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -96,6 +96,7 @@
             <TextView
                 android:id="@+id/controls_section_title"
                 style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="6dip"
                 android:text="@string/controls_subtitle" />
             
             <RelativeLayout
@@ -130,6 +131,7 @@
         <TextView
             android:id="@+id/packages_section_title"
             style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="6dip"
             android:text="@string/packages_subtitle" />
 
         <LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2ca51b..c19f833 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1532,16 +1532,16 @@ found in the list of installed applications.</string>
     <string name="battery_history_starts">Starts: <xliff:g id="starts">%1$d</xliff:g></string>
 
     <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_days"><xliff:g id="days">%1$d</xliff:g> d, <xliff:g id="hours">%2$d</xliff:g> h, <xliff:g id="minutes">%3$d</xliff:g> m, <xliff:g id="seconds">%4$d</xliff:g> s</string>
+    <string name="battery_history_days"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m <xliff:g id="seconds">%4$d</xliff:g>s</string>
 
     <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_hours"><xliff:g id="hours">%1$d</xliff:g> h, <xliff:g id="minutes">%2$d</xliff:g> m, <xliff:g id="seconds">%3$d</xliff:g> s</string>
+    <string name="battery_history_hours"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m <xliff:g id="seconds">%3$d</xliff:g>s</string>
 
     <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
-    <string name="battery_history_minutes"><xliff:g id="minutes">%1$d</xliff:g> m, <xliff:g id="seconds">%2$d</xliff:g> s</string>
+    <string name="battery_history_minutes"><xliff:g id="minutes">%1$d</xliff:g>m <xliff:g id="seconds">%2$d</xliff:g>s</string>
 
     <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
-    <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g> s</string>
+    <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>
 
     <!-- Used to head a list of packages that share a given user id BatteryHistory -->
     <string name="battery_history_packages_sharing_this_uid">Packages sharing this UID:</string>
@@ -1634,6 +1634,8 @@ found in the list of installed applications.</string>
     <string name="battery_since_unplugged">Battery usage since unplugged</string>
     <!-- Battery usage since user reset the stats -->
     <string name="battery_since_reset">Battery usage since reset</string>
+    <!-- Battery usage duration -->
+    <string name="battery_stats_duration">Usage duration - <xliff:g id="time">%1$s</xliff:g></string>
     <!-- CPU awake time title -->
     <string name="awake">Device awake time</string>
     <!-- Wifi on time -->
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 80342a8..450e438 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -16,5 +16,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/battery_since_unplugged">
-
+    <PreferenceCategory
+        android:key="app_list"/>
 </PreferenceScreen>