From 7357c546b28a07e5bcdaf7e1370e12af3137b218 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 31 Dec 2012 01:43:23 +0400
Subject: remove combined mode stuff

---
 res/layout-port/headlines_row.xml                  | 34 --------------------
 res/layout-port/headlines_row_selected.xml         | 35 ---------------------
 res/layout-port/headlines_row_unread.xml           | 34 --------------------
 res/layout-sw600dp-port/headlines_row_selected.xml | 36 ----------------------
 res/layout-sw600dp/headlines_row.xml               | 36 ----------------------
 res/layout-sw600dp/headlines_row_selected.xml      | 36 ----------------------
 res/layout-sw600dp/headlines_row_unread.xml        | 36 ----------------------
 res/layout/headlines_row.xml                       | 36 ----------------------
 res/layout/headlines_row_selected.xml              | 36 ----------------------
 res/layout/headlines_row_unread.xml                | 36 ----------------------
 10 files changed, 355 deletions(-)

(limited to 'res')

diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
index 4a6679bc..4dd8de2d 100644
--- a/res/layout-port/headlines_row.xml
+++ b/res/layout-port/headlines_row.xml
@@ -96,40 +96,6 @@
             </LinearLayout>
         </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index ad5ab33f..46df3f71 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -96,41 +96,6 @@
             </LinearLayout>
         </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:text="Article content" />
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
index ce0cf9a3..f19ebe06 100644
--- a/res/layout-port/headlines_row_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
@@ -96,40 +96,6 @@
             </LinearLayout>
         </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml
index 0b74394c..eb953b91 100644
--- a/res/layout-sw600dp-port/headlines_row_selected.xml
+++ b/res/layout-sw600dp-port/headlines_row_selected.xml
@@ -93,42 +93,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml
index 7055bdda..b32302fd 100644
--- a/res/layout-sw600dp/headlines_row.xml
+++ b/res/layout-sw600dp/headlines_row.xml
@@ -93,42 +93,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml
index 7774357f..5da7e175 100644
--- a/res/layout-sw600dp/headlines_row_selected.xml
+++ b/res/layout-sw600dp/headlines_row_selected.xml
@@ -93,42 +93,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml
index 27b33cce..47b81721 100644
--- a/res/layout-sw600dp/headlines_row_unread.xml
+++ b/res/layout-sw600dp/headlines_row_unread.xml
@@ -93,42 +93,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index b76909e3..4f003505 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -105,42 +105,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index ae24d5d8..ced2e03c 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -105,42 +105,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 088e468b..fafe39b5 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -105,42 +105,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="3dip" >
-    </TextView>
-
-    <LinearLayout
-        android:id="@+id/attachments_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" >
-
-        <Spinner
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:prompt="@string/attachments_prompt" />
-
-        <Button
-            android:id="@+id/attachment_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_view" />
-
-        <Button
-            android:id="@+id/attachment_copy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/attachment_copy" />
-    </LinearLayout>
-
     <ImageButton
         android:id="@+id/article_menu_button"
         android:layout_width="50dp"
-- 
cgit v1.2.3-54-g00ecf