Updated layout for download items.

Switch to using GridLayout, because it's awesome.  Also move status
display to right-hand side, showing date when in completed state.

Bug: 6378944
Change-Id: I540633010ed4aeeae299cedf7a49fdb81e65b431

2 files changed, 51 insertions, 61 deletions

diff --git a/ui/res/layout/download_list.xml b/ui/res/layout/download_list.xml
index 18f44d10..e4ebf7c9 100644
--- a/ui/res/layout/download_list.xml
+++ b/ui/res/layout/download_list.xml
@@ -35,14 +35,16 @@
                             android:paddingBottom="16dip"
                             android:clipToPadding="false"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"/>
+                            android:layout_height="match_parent"
+                            android:scrollbarStyle="outsideOverlay" />
         <ListView android:id="@+id/size_ordered_list"
                   android:paddingLeft="16dip"
                   android:paddingRight="16dip"
                   android:paddingBottom="16dip"
                   android:clipToPadding="false"
                   android:layout_width="match_parent"
-                  android:layout_height="match_parent"/>
+                  android:layout_height="match_parent"
+                  android:scrollbarStyle="outsideOverlay" />
         <TextView xmlns:android="http://schemas.android.com/apk/res/android"
                   android:id="@+id/empty"
                   android:layout_width="match_parent"
diff --git a/ui/res/layout/download_list_item.xml b/ui/res/layout/download_list_item.xml
index 8548e3cc..a87ce7bd 100644
--- a/ui/res/layout/download_list_item.xml
+++ b/ui/res/layout/download_list_item.xml
@@ -21,69 +21,57 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:descendantFocusability="blocksDescendants"
-    android:gravity="center_vertical">
-    
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="4"
+    android:descendantFocusability="blocksDescendants">
 
     <!-- Clicks are handled directly by DownloadItem -->
-    <CheckBox android:id="@+id/download_checkbox"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentLeft="true"
-              android:paddingLeft="8dip"
-              android:scaleType="fitCenter"
-              android:layout_centerVertical="true"
-              android:clickable="false"/>
+    <CheckBox
+        android:id="@+id/download_checkbox"
+        android:layout_rowSpan="3"
+        android:layout_gravity="center_vertical"
+        android:clickable="false" />
 
-    <ImageView android:id="@+id/download_icon"
-               android:layout_width="@android:dimen/app_icon_size"
-               android:layout_height="@android:dimen/app_icon_size"
-               android:paddingLeft="8dip"
-               android:layout_toRightOf="@id/download_checkbox"
-               android:layout_centerVertical="true"
-               android:scaleType="fitCenter" />
+    <ImageView
+        android:id="@+id/download_icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_rowSpan="3"
+        android:layout_marginRight="8dip"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerInside" />
 
-    <TextView android:id="@+id/download_title"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentTop="true"
-              android:layout_toRightOf="@id/download_icon"
-              android:maxLines="1"
-              android:paddingLeft="8dip"
-              android:textStyle="bold"
-              android:textAppearance="?android:attr/textAppearanceSmall" />
-    <TextView android:id="@+id/domain"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/download_title"
-              android:layout_toRightOf="@id/download_icon"
-              android:maxLines="1"
-              android:paddingLeft="8dip"
-              android:textAppearance="?android:attr/textAppearanceSmall" />
+    <TextView
+        android:id="@+id/download_title"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textStyle="bold"
+        android:textAppearance="?android:attr/textAppearance" />
 
-    <TextView android:id="@+id/last_modified_date"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/domain"
-              android:layout_alignParentRight="true"
-              android:maxLines="1"
-              android:textAppearance="?android:attr/textAppearanceSmall" />
+    <TextView
+        android:id="@+id/domain"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
-    <TextView android:id="@+id/status_text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/domain"
-              android:layout_toRightOf="@id/download_icon"
-              android:paddingLeft="8dip"
-              android:textAppearance="?android:attr/textAppearanceSmall" />
-    <TextView android:id="@+id/size_text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/domain"
-              android:layout_toRightOf="@id/status_text"
-              android:maxLines="1"
-              android:textAppearance="?android:attr/textAppearanceSmall"
-              android:paddingLeft="15dp"/>
-</com.android.providers.downloads.ui.DownloadItem>
+    <TextView
+        android:id="@+id/size_text"
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/status_text"
+        android:layout_marginLeft="8dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
+</com.android.providers.downloads.ui.DownloadItem>