From 0a7c9640d72c156c5496326d802eaae89a9bf658 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 18 Oct 2013 00:53:18 +0400
Subject: Revert "bump version"

This reverts commit cc67716030f04c014b6a36be33318676c2f91872.
---
 res/layout/headlines_row.xml                 | 12 +-----------
 res/layout/headlines_row_selected.xml        |  8 --------
 res/layout/headlines_row_selected_unread.xml |  8 --------
 res/layout/headlines_row_unread.xml          | 21 +++++----------------
 4 files changed, 6 insertions(+), 43 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 009048d2..6df28379 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -35,19 +35,9 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:singleLine="false"
-                android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit."
+                android:text="Sample entry title"
                 android:textColor="?headlineTextColor"
                 android:textSize="18sp" />
-
-            <ImageView
-                android:id="@+id/feed_icon"
-                android:layout_width="16dp"
-        		android:layout_height="16dp"
-        		android:scaleType="fitXY"
-                android:layout_weight="0"               
-                
-                android:src="@drawable/ic_published" />
-
         </LinearLayout>
 
         <LinearLayout
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index a4216ea8..849e2b6f 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -36,14 +36,6 @@
                 android:text="Sample entry title"
                 android:textColor="?attr/headlineSelectedTextColor"
                 android:textSize="18sp" />
-            
-            <ImageView
-                android:id="@+id/feed_icon"
-                android:layout_width="16dp"
-        		android:layout_height="16dp"
-        		android:scaleType="fitXY"
-        		android:layout_weight="0" 
-                android:src="@drawable/ic_published" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index d6457e62..0fa6e213 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -37,14 +37,6 @@
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="18sp"
                 android:textStyle="bold" />
-            
-            <ImageView
-                android:id="@+id/feed_icon"
-                android:layout_width="16dp"
-        		android:layout_height="16dp"
-        		android:scaleType="fitXY"
-        		android:layout_weight="0" 
-                android:src="@drawable/ic_published" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index f493dce8..44f1c218 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -14,11 +14,8 @@
         android:layout_height="match_parent"
         android:background="?headlineUnreadBackground"
         android:orientation="vertical"
-        android:paddingBottom="2dp"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="6dp" >
- 
+        android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >
+
         <LinearLayout
             android:id="@+id/linearLayout6"
             android:layout_width="match_parent"
@@ -37,14 +34,6 @@
                 android:textColor="?headlineUnreadTextColor"
                 android:textSize="18sp"
                 android:textStyle="bold" />
-
-            <ImageView
-                android:id="@+id/feed_icon"
-                android:layout_width="16dp"
-        		android:layout_height="16dp"
-        		android:scaleType="fitXY"
-        		android:layout_weight="0" 
-                android:src="@drawable/ic_published" />
         </LinearLayout>
 
         <LinearLayout
@@ -96,7 +85,7 @@
             <CheckBox
                 android:id="@+id/selected"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content"                
                 android:layout_weight="0"
                 android:focusable="false" />
 
@@ -116,18 +105,18 @@
                 android:id="@+id/marked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
                 android:layout_weight="0"
                 android:clickable="true"
+                android:layout_marginRight="8dp"
                 android:src="@drawable/ic_star_empty" />
 
             <ImageView
                 android:id="@+id/published"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="6dp"
                 android:layout_weight="0"
                 android:clickable="true"
+                android:layout_marginRight="6dp"
                 android:src="@drawable/ic_unpublished" />
 
             <ImageView
-- 
cgit v1.2.3-54-g00ecf