From c396ab425878bb2e7c5195d739b070377cb6aa1e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 12 May 2013 18:35:40 +0400
Subject: update all headline views (remove unnecessary variants), add separate
 color for secondary headline text

---
 res/layout-port/headlines_row.xml                  | 114 -------------
 res/layout-port/headlines_row_selected.xml         | 115 -------------
 res/layout-port/headlines_row_selected_unread.xml  | 116 -------------
 res/layout-port/headlines_row_unread.xml           | 116 -------------
 res/layout-sw600dp/headlines_row.xml               | 125 --------------
 res/layout-sw600dp/headlines_row_selected.xml      | 125 --------------
 .../headlines_row_selected_unread.xml              | 126 --------------
 res/layout-sw600dp/headlines_row_unread.xml        | 126 --------------
 res/layout/headlines_row.xml                       | 165 ++++++++++---------
 res/layout/headlines_row_selected.xml              | 179 ++++++++++----------
 res/layout/headlines_row_selected_unread.xml       | 181 +++++++++++----------
 res/layout/headlines_row_unread.xml                | 181 ++++++++++-----------
 res/values-v11/style.xml                           |   5 +
 res/values/attrs.xml                               |   4 +-
 res/values/style.xml                               |   5 +
 15 files changed, 370 insertions(+), 1313 deletions(-)
 delete mode 100644 res/layout-port/headlines_row.xml
 delete mode 100644 res/layout-port/headlines_row_selected.xml
 delete mode 100644 res/layout-port/headlines_row_selected_unread.xml
 delete mode 100644 res/layout-port/headlines_row_unread.xml
 delete mode 100644 res/layout-sw600dp/headlines_row.xml
 delete mode 100644 res/layout-sw600dp/headlines_row_selected.xml
 delete mode 100644 res/layout-sw600dp/headlines_row_selected_unread.xml
 delete mode 100644 res/layout-sw600dp/headlines_row_unread.xml

(limited to 'res')

diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
deleted file mode 100644
index ec0e6cd8..00000000
--- a/res/layout-port/headlines_row.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineNormalBackground"
-    android:gravity="center_vertical"
-    android:orientation="vertical" >
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?headlineTextColor"
-                android:textSize="16sp" />
-
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" />
-
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingRight="4dp" >
-
-                <CheckBox
-                    android:id="@+id/selected"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:focusable="false" />
-
-
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Jan 01, 00:00"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp"
-                    android:textStyle="italic" />
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" />
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" />
-            </LinearLayout>
-        </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
deleted file mode 100644
index ed7c4d06..00000000
--- a/res/layout-port/headlines_row_selected.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackgroundSolid"
-    android:gravity="center_vertical"
-    android:orientation="vertical" >
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="normal" />
-
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" />
-
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingRight="4dp" >
-
-                <CheckBox
-                    android:id="@+id/selected"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:focusable="false" />
-
-
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Jan 01, 00:00"
-                    android:textColor="?headlineSelectedExcerptTextColor"
-                    android:textSize="10sp"
-                    android:textStyle="italic" />
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" />
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" />
-            </LinearLayout>
-        </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_selected_unread.xml b/res/layout-port/headlines_row_selected_unread.xml
deleted file mode 100644
index 63cc67fa..00000000
--- a/res/layout-port/headlines_row_selected_unread.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackgroundSolid"
-    android:gravity="center_vertical"
-    android:orientation="vertical" >
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" />
-
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingRight="4dp" >
-
-                <CheckBox
-                    android:id="@+id/selected"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:focusable="false" />
-
-
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Jan 01, 00:00"
-                    android:textColor="?headlineSelectedExcerptTextColor"
-                    android:textSize="10sp"
-                    android:textStyle="italic" />
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" />
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" />
-            </LinearLayout>
-        </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
deleted file mode 100644
index 4b3c10b7..00000000
--- a/res/layout-port/headlines_row_unread.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineUnreadBackground"
-    android:gravity="center_vertical"
-    android:orientation="vertical" >
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?headlineUnreadTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" />
-
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingRight="4dp" >
-
-                <CheckBox
-                    android:id="@+id/selected"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:focusable="false" />
-
-
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Jan 01, 00:00"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp"
-                    android:textStyle="italic" />
-
-                <ImageView
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@android:drawable/star_off" />
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" />
-            </LinearLayout>
-        </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
deleted file mode 100644
index 80da7423..00000000
--- a/res/layout-sw600dp/headlines_row.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineNormalBackground"
-    android:orientation="vertical"
-    android:padding="6dp" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineTextColor"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            android:src="@android:drawable/star_off" />
-
-        <ImageView
-            android:id="@+id/published"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"            
-            android:src="@drawable/ic_rss_bw" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
deleted file mode 100644
index 3cfd98e8..00000000
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackground"
-    android:orientation="vertical"
-    android:padding="6dp" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineSelectedTextColor"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineSelectedExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            android:src="@android:drawable/star_off" />
-
-        <ImageView
-            android:id="@+id/published"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"            
-            android:src="@drawable/ic_rss_bw" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_selected_unread.xml b/res/layout-sw600dp/headlines_row_selected_unread.xml
deleted file mode 100644
index 2d3354b6..00000000
--- a/res/layout-sw600dp/headlines_row_selected_unread.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackground"
-    android:orientation="vertical"
-    android:padding="6dp" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineSelectedTextColor"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineSelectedExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineSelectedExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            android:src="@android:drawable/star_off" />
-
-        <ImageView
-            android:id="@+id/published"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"            
-            android:src="@drawable/ic_rss_bw" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
deleted file mode 100644
index 4187af8f..00000000
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?headlineUnreadBackground"
-    android:orientation="vertical"
-    android:padding="6dp" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <CheckBox
-            android:id="@+id/selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="false"
-            android:text="{Title...}"
-            android:textColor="?headlineUnreadTextColor"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp" >
-
-        <TextView
-            android:id="@+id/feed_title"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="0.25"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Feed title...}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="right|center_vertical"
-            android:text="Jan 01"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp"
-            android:textStyle="italic" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="6dp"
-        android:text="{Content excerpt...}"
-        android:textColor="?headlineExcerptTextColor"
-        android:textSize="13sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:paddingRight="0dp"
-        android:paddingTop="0dp" >
-
-        <TextView
-            android:id="@+id/author"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="{Author}"
-            android:textColor="?headlineExcerptTextColor"
-            android:textSize="12sp" />
-
-        <ImageView
-            android:id="@+id/marked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
-            android:paddingRight="6dp"
-            android:src="@android:drawable/star_off" />
-
-        <ImageView
-            android:id="@+id/published"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"            
-            android:src="@drawable/ic_rss_bw" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index ccbf4366..cba81d24 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineNormalBackground"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:paddingRight="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -18,101 +19,107 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dp" >
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineTextColor"
+            android:textSize="16sp" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineTextColor"
-                android:textSize="16sp" >
+    </LinearLayout>
 
-            </TextView>
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:text="Jan 01"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    </LinearLayout>
 
-            </LinearLayout>
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineExcerptTextColor"
+        android:textSize="13sp" />
 
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
 
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="Jan 01"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="10sp"
-                android:textStyle="italic" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <ImageView
+            android:id="@+id/marked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="6dp" >
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index babf3f6b..cf138c47 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -3,8 +3,9 @@
     android:id="@+id/headlines_row"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackgroundSolid"
-    android:orientation="vertical" >
+    android:background="?headlineSelectedBackground"
+    android:orientation="vertical"
+    android:paddingRight="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -18,108 +19,108 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dp" >
-
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineSelectedTextColor"
+            android:textSize="16sp" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="normal" >
-
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    </LinearLayout>
 
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-            </LinearLayout>
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:paddingRight="12dp"
+            android:text="Jan 01"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp"
-                android:textStyle="italic" />
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineSelectedExcerptTextColor"
+        android:textSize="13sp" />
 
-        </LinearLayout>
-
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
 
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="6dp" >
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 03c4ffdb..7a9930c3 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -3,14 +3,14 @@
     android:id="@+id/headlines_row"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="?headlineSelectedBackgroundSolid"
-    android:orientation="vertical" >
+    android:background="?headlineSelectedBackground"
+    android:orientation="vertical"
+    android:paddingRight="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
         android:orientation="horizontal" >
 
         <CheckBox
@@ -18,108 +18,109 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dp" >
-
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" >
-
-            </TextView>
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineSelectedTextColor"
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    </LinearLayout>
 
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-            </LinearLayout>
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:paddingRight="12dp"
+            android:text="Jan 01"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="10sp"
-                android:textStyle="italic" />
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineSelectedExcerptTextColor"
+        android:textSize="13sp" />
 
-        </LinearLayout>
-
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
 
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="6dp" >
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 186048e6..f7eea275 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -4,9 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?headlineUnreadBackground"
-    android:orientation="vertical" >
-
-
+    android:orientation="vertical"
+    android:paddingRight="6dp" >
 
     <LinearLayout
         android:id="@+id/linearLayout6"
@@ -20,109 +19,109 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout1"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="3dp" >
-
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="false"
+            android:text="{Title...}"
+            android:textColor="?headlineUnreadTextColor"
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="false"
-                android:text="{Title...}"
-                android:textColor="?headlineUnreadTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" >
-
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <TextView
-                    android:id="@+id/feed_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    </LinearLayout>
 
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp" >
 
-            </LinearLayout>
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0.25"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Feed title...}"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:gravity="right|center_vertical"
+            android:paddingRight="12dp"
+            android:text="Jan 01"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="{Content excerpt...}"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="Jan 01"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="10sp"
-                android:textStyle="italic" />
+    <TextView
+        android:id="@+id/excerpt"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="6dp"
+        android:text="{Content excerpt...}"
+        android:textColor="?headlineExcerptTextColor"
+        android:textSize="13sp" />
 
-        </LinearLayout>
-
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dp"
+        android:paddingRight="0dp"
+        android:paddingTop="0dp" >
 
-        <LinearLayout
-            android:id="@+id/linearLayout4"
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="{Author}"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/marked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingRight="6dp" >
+            android:layout_weight="0"
+            android:clickable="true"
+            android:paddingRight="6dp"
+            android:src="@android:drawable/star_off" />
 
-            <ImageView
-                android:id="@+id/marked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@android:drawable/star_off" />
+        <ImageView
+            android:id="@+id/published"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:clickable="true"            
+            android:src="@drawable/ic_rss_bw" />
 
-            <ImageView
-                android:id="@+id/published"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:src="@drawable/ic_rss_bw" />
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index 4bb7bf8f..e764ab9b 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -19,6 +19,8 @@
     	<item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
     	<item name="headlineSelectedTextColor">#ffffff</item>
     	<item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
+    	<item name="headlineSecondaryTextColor">#909090</item>
+    	<item name="headlineSelectedSecondaryTextColor">#606060</item>
     	<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
     	<item name="linkColor">#30B0E0</item>
@@ -67,6 +69,8 @@
         <item name="headlineSelectedTextColor">@android:color/white</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
+        <item name="headlineSecondaryTextColor">#909090</item>
+        <item name="headlineSelectedSecondaryTextColor">#404040</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
         <item name="linkColor">@color/ics_cyan</item>
         <item name="loadingBackground">@android:color/black</item>
@@ -90,6 +94,7 @@
         <item name="headlineTextColor">@android:color/secondary_text_dark</item>
         <item name="actionBarStyle">@style/ActionBarDarkGray</item>
         <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
+        <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
 	</style>
 	
 	<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0338016e..c985776b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,8 +17,10 @@
     <attr name="feedlistSelectedTextColor" format="reference|color" />
     <attr name="headlineTextColor" format="reference|color" />
     <attr name="headlineUnreadTextColor" format="reference|color" />
-    <attr name="headlineSelectedTextColor" format="reference|color" />
+    <attr name="headlineSelectedTextColor" format="reference|color" />    
     <attr name="headlineExcerptTextColor" format="reference|color" />
+    <attr name="headlineSecondaryTextColor" format="reference|color" />
+    <attr name="headlineSelectedSecondaryTextColor" format="reference|color" />
     <attr name="headlineSelectedExcerptTextColor" format="reference|color" />
     <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
     <attr name="linkColor" format="reference|color" />
diff --git a/res/values/style.xml b/res/values/style.xml
index 0a354547..88521a96 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -20,6 +20,8 @@
         <item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
         <item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
+        <item name="headlineSecondaryTextColor">#909090</item>
+    	<item name="headlineSelectedSecondaryTextColor">#606060</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
         <item name="linkColor">#5858F8</item>
@@ -62,6 +64,8 @@
         <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
         <item name="headlineSelectedTextColor">@android:color/black</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
+        <item name="headlineSecondaryTextColor">#909090</item>
+        <item name="headlineSelectedSecondaryTextColor">#404040</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
         <item name="linkColor">#5858F8</item>
@@ -83,6 +87,7 @@
         <item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_gray</item>
         <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
+        <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
         <item name="headlineTextColor">@android:color/secondary_text_dark</item>
         <item name="actionBarStyle">@style/ActionBarDarkGray</item>        
     </style>
-- 
cgit v1.2.3