Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

6 files changed, 63 insertions, 1 deletions

diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index bd033b25..ffea8cf6 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -3,6 +3,7 @@
     android:id="@+id/feeds_row"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
+    android:descendantFocusability="blocksDescendants"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingBottom="10dip"
@@ -42,4 +43,15 @@
         android:textSize="13sp"
         android:textStyle="bold" />
 
+    <ImageButton
+        android:id="@+id/feed_menu_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:background="@null"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index cb95a819..b1d53549 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:background="?feedsSelectedBackgroundSolid"
+    android:descendantFocusability="blocksDescendants"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingBottom="10dip"
@@ -43,4 +44,15 @@
         android:textSize="13sp"
         android:textStyle="bold" />
 
+    <ImageButton
+        android:id="@+id/feed_menu_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:background="@null"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 94d5f856..d339e281 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -120,6 +120,15 @@
             android:clickable="true"            

             android:src="@drawable/ic_rss_bw" />

 

+        <ImageButton

+            android:id="@+id/article_menu_button"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="@null"

+            android:paddingLeft="6dp"

+            android:paddingTop="6dp"

+            android:src="@drawable/ic_mailbox_collapsed_holo_light" />

     </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 e1788ad5..be2239d9 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -120,6 +120,16 @@
             android:layout_weight="0"

             android:clickable="true"            

             android:src="@drawable/ic_rss_bw" />

+        

+        <ImageButton

+            android:id="@+id/article_menu_button"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="@null"

+            android:paddingLeft="6dp"

+            android:paddingTop="6dp"

+            android:src="@drawable/ic_mailbox_collapsed_holo_light" />

 

     </LinearLayout>

 

diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 9051cfc9..93135abb 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -122,6 +122,15 @@
             android:clickable="true"            

             android:src="@drawable/ic_rss_bw" />

 

+        <ImageButton

+            android:id="@+id/article_menu_button"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="@null"

+            android:paddingLeft="6dp"

+            android:paddingTop="6dp"

+            android:src="@drawable/ic_mailbox_collapsed_holo_light" />

     </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 b43b7f22..fc1ab67a 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -118,9 +118,19 @@
             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_weight="0"

-            android:clickable="true"            

+            android:clickable="true"

             android:src="@drawable/ic_rss_bw" />

 

+        <ImageButton

+            android:id="@+id/article_menu_button"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="@null"

+            android:paddingLeft="6dp"

+            android:paddingTop="6dp"

+            android:src="@drawable/ic_mailbox_collapsed_holo_light" />

+

     </LinearLayout>

 

 </LinearLayout>
\ No newline at end of file