Snapshot UI update

 Bug: 5045575
 Bug: 4982126

Change-Id: Idb446ca8ad7a92942be15436eaf2f5fb8875abeb
diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml
index 128dedf..7c7ba3b 100644
--- a/res/layout/snapshot_item.xml
+++ b/res/layout/snapshot_item.xml
@@ -28,7 +28,7 @@
         android:cropToPadding="true"
         android:background="@drawable/border_thumb_bookmarks_widget_holo" />
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/thumb"
@@ -37,30 +37,32 @@
         android:background="@drawable/overlay_url_bookmark_widget_holo"
         android:singleLine="true"
         android:ellipsize="end"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:typeface="sans"
-        android:textColor="@android:color/white"
+        android:textColor="#AAAAAA"
         android:paddingLeft="6dip"
         android:paddingRight="2dip"
         android:gravity="center_vertical" />
+    <TextView android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/thumb"
+        android:layout_alignLeft="@+id/thumb"
+        android:layout_alignRight="@+id/thumb"
+        android:layout_marginTop="6dip"
+        android:paddingLeft="8dip"
+        android:gravity="center_vertical"
+        android:typeface="sans"
+        android:textSize="12sp"
+        android:textColor="#AAAAAA"
+        android:lines="2" />
     <ImageView
         android:id="@+id/divider"
         android:src="?android:attr/dividerVertical"
         android:layout_width="wrap_content"
-        android:layout_height="24dip"
-        android:layout_below="@+id/thumb"
-        android:layout_alignLeft="@+id/thumb"
-        android:scaleType="fitXY"
-        android:layout_marginTop="12dip" />
-    <TextView android:id="@+id/date"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/divider"
-        android:layout_alignTop="@id/divider"
-        android:layout_alignBottom="@id/divider"
-        android:paddingLeft="8dip"
-        android:gravity="center_vertical"
-        android:typeface="sans"
-        android:textSize="14sp"
-        android:textColor="#AAAAAA" />
+        android:layout_alignLeft="@+id/title"
+        android:layout_alignTop="@+id/title"
+        android:layout_alignBottom="@+id/title"
+        android:scaleType="fitXY" />
 </RelativeLayout>
diff --git a/res/layout/snapshots.xml b/res/layout/snapshots.xml
index 54d4e01..a02fbb9 100644
--- a/res/layout/snapshots.xml
+++ b/res/layout/snapshots.xml
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:paddingTop="@dimen/combo_paddingTop">
 
-    <GridView
+    <com.android.browser.view.SnapshotGridView
         android:id="@+id/grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"