2 files changed, 44 insertions, 49 deletions
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
index 013bcdb07..f4be77246 100755
--- a/res/layout/usage_stats.xml
+++ b/res/layout/usage_stats.xml
@@ -4,40 +4,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:text="@string/display_order_text"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <Spinner
-        android:id="@+id/typeSpinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:entries="@array/usage_stats_display_order_types" />
-
     <LinearLayout
-        android:orientation="horizontal"
+        android:padding="5dp"
+        android:gravity="center_vertical"
+        android:background="@*android:color/material_grey_300"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" > 
+        android:layout_height="?android:attr/actionBarSize">
         <TextView
-            android:text="@string/app_name_label"
+            android:layout_marginStart="11dp"
+            android:text="@string/display_order_text"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
-            android:paddingEnd="6dip"
             android:layout_height="wrap_content" />
-        <TextView
-            android:text="@string/last_time_used_label"
-            android:paddingEnd="6dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:text="@string/usage_time_label"
+
+        <Spinner
+            android:id="@+id/typeSpinner"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:entries="@array/usage_stats_display_order_types" />
     </LinearLayout>
+
     <ListView android:id="@+id/pkg_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
index 2879df072..763599009 100755
--- a/res/layout/usage_stats_item.xml
+++ b/res/layout/usage_stats_item.xml
@@ -2,6 +2,7 @@
 <!--
 /*
 ** Copyright 2008, The Android Open Source Project
+** Copyright 2015, The CyanogenMod Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -20,31 +21,37 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:minHeight="?android:attr/listPreferredItemHeight">
-
-    <TextView android:id="@+id/package_name"
-        android:layout_width="wrap_content"
+    android:padding="16dp"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingEnd="6dip"
-        android:paddingStart="12dip"
-        android:maxLines="1" />
-
-    <TextView android:id="@+id/last_time_used"
-        android:layout_width="wrap_content"
+        android:orientation="horizontal" > 
+        <TextView
+            android:text="@string/app_name_label_cm"
+            style="@style/usage_stats_list_label" />
+        <TextView android:id="@+id/package_name"
+            style="@style/usage_stats_list_value" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingEnd="6dip"
-        android:paddingStart="12dip"
-        android:maxLines="1" />
-
-    <TextView android:id="@+id/usage_time"
-        android:layout_width="wrap_content"
+        android:orientation="horizontal" >
+        <TextView
+            android:text="@string/usage_time_label_cm"
+            style="@style/usage_stats_list_label" />
+        <TextView android:id="@+id/usage_time"
+            style="@style/usage_stats_list_value" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingEnd="6dip"
-        android:paddingStart="12dip"
-        android:maxLines="1" />
+        android:orientation="horizontal" >
+        <TextView
+            android:text="@string/last_time_used_label_cm"
+            style="@style/usage_stats_list_label" />
+        <TextView android:id="@+id/last_time_used"
+            style="@style/usage_stats_list_value" />
+    </LinearLayout>
 </LinearLayout>