From b826481001889868a57fb37b80fcfd7b109ab1a8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 1 Sep 2012 22:22:13 +0400
Subject: properly detect portrait orientation move to ICS style of naming
 resources for various dpi bump version

---
 AndroidManifest.xml                                |   4 +-
 res/layout-sw768dp-port/headlines_row_selected.xml | 132 +++++++++++++++++++
 res/layout-sw768dp-port/main.xml                   |  60 +++++++++
 res/layout-sw768dp/feeds_row_selected.xml          |  38 ++++++
 res/layout-sw768dp/headlines_row.xml               | 141 +++++++++++++++++++++
 res/layout-sw768dp/headlines_row_selected.xml      | 141 +++++++++++++++++++++
 res/layout-sw768dp/headlines_row_unread.xml        | 141 +++++++++++++++++++++
 res/layout-sw768dp/main.xml                        |  55 ++++++++
 res/layout-xlarge-port/headlines_row_selected.xml  | 132 -------------------
 res/layout-xlarge-port/main.xml                    |  60 ---------
 res/layout-xlarge/feeds_row_selected.xml           |  38 ------
 res/layout-xlarge/headlines_row.xml                | 141 ---------------------
 res/layout-xlarge/headlines_row_selected.xml       | 141 ---------------------
 res/layout-xlarge/headlines_row_unread.xml         | 141 ---------------------
 res/layout-xlarge/main.xml                         |  55 --------
 src/org/fox/ttrss/CommonActivity.java              |  10 +-
 src/org/fox/ttrss/HeadlinesFragment.java           |   2 +-
 src/org/fox/ttrss/MainActivity.java                |   8 +-
 src/org/fox/ttrss/OnlineServices.java              |   2 +-
 src/org/fox/ttrss/offline/OfflineActivity.java     |   6 +-
 .../ttrss/offline/OfflineHeadlinesFragment.java    |   2 +-
 src/org/fox/ttrss/offline/OfflineServices.java     |   2 +-
 22 files changed, 729 insertions(+), 723 deletions(-)
 create mode 100644 res/layout-sw768dp-port/headlines_row_selected.xml
 create mode 100644 res/layout-sw768dp-port/main.xml
 create mode 100644 res/layout-sw768dp/feeds_row_selected.xml
 create mode 100644 res/layout-sw768dp/headlines_row.xml
 create mode 100644 res/layout-sw768dp/headlines_row_selected.xml
 create mode 100644 res/layout-sw768dp/headlines_row_unread.xml
 create mode 100644 res/layout-sw768dp/main.xml
 delete mode 100644 res/layout-xlarge-port/headlines_row_selected.xml
 delete mode 100644 res/layout-xlarge-port/main.xml
 delete mode 100644 res/layout-xlarge/feeds_row_selected.xml
 delete mode 100644 res/layout-xlarge/headlines_row.xml
 delete mode 100644 res/layout-xlarge/headlines_row_selected.xml
 delete mode 100644 res/layout-xlarge/headlines_row_unread.xml
 delete mode 100644 res/layout-xlarge/main.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2aba21c..919036c3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="87"
-    android:versionName="0.6.11" >
+    android:versionCode="88"
+    android:versionName="0.6.12" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="11" />
 
diff --git a/res/layout-sw768dp-port/headlines_row_selected.xml b/res/layout-sw768dp-port/headlines_row_selected.xml
new file mode 100644
index 00000000..7e89eb7a
--- /dev/null
+++ b/res/layout-sw768dp-port/headlines_row_selected.xml
@@ -0,0 +1,132 @@
+<?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:orientation="vertical" >
+
+    <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="6dip"
+            android:paddingRight="6dip" >
+        </CheckBox>
+
+        <LinearLayout
+            android:id="@+id/linearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textColor="?headlineSelectedTextColor"
+                android:text="{Title...}"
+                android:textSize="16sp" >
+            </TextView>
+
+            <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>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jan 01"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+
+            <LinearLayout
+                android:id="@+id/linearLayout4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingRight="2sp" >
+
+                <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>
+
+                <ImageView
+                    android:id="@+id/published"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:src="@drawable/ic_rss_bw" >
+                </ImageView>
+            </LinearLayout>
+        </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>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw768dp-port/main.xml b/res/layout-sw768dp-port/main.xml
new file mode 100644
index 00000000..b640efcf
--- /dev/null
+++ b/res/layout-sw768dp-port/main.xml
@@ -0,0 +1,60 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:background="?feedlistBackground" >
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/vertical_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <FrameLayout
+                android:id="@+id/headlines_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.5"
+                android:background="?headlinesBackgroundSolid" >
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/article_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="?articleBackground" 
+                android:layout_weight="0.5" >
+            </FrameLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/loading_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:background="?loadingBackground"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/loading_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/loading_message"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout-sw768dp/feeds_row_selected.xml b/res/layout-sw768dp/feeds_row_selected.xml
new file mode 100644
index 00000000..d8481005
--- /dev/null
+++ b/res/layout-sw768dp/feeds_row_selected.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:background="?feedsSelectedBackground"
+    android:gravity="center_vertical"
+    android:id="@+id/feeds_row" android:layout_width="match_parent" android:paddingBottom="4dip" android:paddingLeft="8dip" android:paddingRight="8dip" android:paddingTop="4dip">
+
+    <ImageView
+        android:id="@+id/icon"
+		android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:scaleType="fitXY"
+        
+        android:layout_weight="0"
+        android:src="@drawable/ic_rss_bw" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"           
+            android:layout_gravity="center_vertical"    
+            android:paddingLeft="6dip" 
+            android:textColor="?feedlistSelectedTextColor"  
+            android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/>
+        <TextView
+            android:id="@+id/unread_counter"
+            android:gravity="right"
+            android:textStyle="bold"
+            android:paddingRight="12dp"
+            android:textColor="?unreadCounterColor"
+            android:layout_gravity="center_vertical"            
+            android:layout_width="wrap_content"
+            android:layout_weight="0"
+            android:layout_height="wrap_content"
+            android:text="{123}" android:textSize="13sp"/>
+                   
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw768dp/headlines_row.xml b/res/layout-sw768dp/headlines_row.xml
new file mode 100644
index 00000000..bb673f9f
--- /dev/null
+++ b/res/layout-sw768dp/headlines_row.xml
@@ -0,0 +1,141 @@
+<?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" >
+
+
+    <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="6dip"
+            android:paddingRight="6dip" >
+        </CheckBox>
+
+        <LinearLayout
+            android:id="@+id/linearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textColor="?headlineTextColor"
+                android:text="{Title...}"
+                android:textSize="16sp" >
+            </TextView>
+
+            <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>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jan 01"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+
+            <LinearLayout
+                android:id="@+id/linearLayout4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingRight="2sp" >
+
+                <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>
+
+                <ImageView
+                    android:id="@+id/published"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:src="@drawable/ic_rss_bw" >
+                </ImageView>
+            </LinearLayout>
+        </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_gravity="right"
+        android:background="@android:color/transparent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+        
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw768dp/headlines_row_selected.xml b/res/layout-sw768dp/headlines_row_selected.xml
new file mode 100644
index 00000000..5df99772
--- /dev/null
+++ b/res/layout-sw768dp/headlines_row_selected.xml
@@ -0,0 +1,141 @@
+<?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" >
+
+    <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="6dip"
+            android:paddingRight="6dip" >
+        </CheckBox>
+
+        <LinearLayout
+            android:id="@+id/linearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textColor="?headlineSelectedTextColor"
+                android:text="{Title...}"
+                android:textSize="16sp" >
+            </TextView>
+
+            <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>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jan 01"
+                android:textColor="?headlineSelectedExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+
+            <LinearLayout
+                android:id="@+id/linearLayout4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingRight="2sp" >
+
+                <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>
+
+                <ImageView
+                    android:id="@+id/published"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:src="@drawable/ic_rss_bw" >
+                </ImageView>
+            </LinearLayout>
+        </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_gravity="right"
+        android:background="@android:color/transparent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+        
+        
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw768dp/headlines_row_unread.xml b/res/layout-sw768dp/headlines_row_unread.xml
new file mode 100644
index 00000000..5ccac557
--- /dev/null
+++ b/res/layout-sw768dp/headlines_row_unread.xml
@@ -0,0 +1,141 @@
+<?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" >
+
+    <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="6dip"
+            android:paddingRight="6dip" >
+        </CheckBox>
+
+        <LinearLayout
+            android:id="@+id/linearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="{Title...}"
+                android:textColor="?headlineUnreadTextColor"
+                android:textSize="16sp" >
+            </TextView>
+
+            <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>
+
+        <LinearLayout
+            android:id="@+id/linerLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="3dip" >
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jan 01"
+                android:textColor="?headlineExcerptTextColor"
+                android:textSize="13sp" >
+            </TextView>
+
+            <LinearLayout
+                android:id="@+id/linearLayout4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingRight="2sp" >
+
+                <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>
+
+                <ImageView
+                    android:id="@+id/published"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:src="@drawable/ic_rss_bw" >
+                </ImageView>
+            </LinearLayout>
+        </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_gravity="right"
+        android:background="@android:color/transparent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+        
+        
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw768dp/main.xml b/res/layout-sw768dp/main.xml
new file mode 100644
index 00000000..9df4e048
--- /dev/null
+++ b/res/layout-sw768dp/main.xml
@@ -0,0 +1,55 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.3"
+            android:background="?feedlistBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/headlines_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"
+            android:background="?headlinesBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/article_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:background="?articleBackground" >
+        </FrameLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/loading_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?loadingBackground"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/loading_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/loading_message"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge-port/headlines_row_selected.xml b/res/layout-xlarge-port/headlines_row_selected.xml
deleted file mode 100644
index 7e89eb7a..00000000
--- a/res/layout-xlarge-port/headlines_row_selected.xml
+++ /dev/null
@@ -1,132 +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:orientation="vertical" >
-
-    <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="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="?headlineSelectedTextColor"
-                android:text="{Title...}"
-                android:textSize="16sp" >
-            </TextView>
-
-            <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>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </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>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge-port/main.xml b/res/layout-xlarge-port/main.xml
deleted file mode 100644
index b640efcf..00000000
--- a/res/layout-xlarge-port/main.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <LinearLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal" >
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0"
-            android:background="?feedlistBackground" >
-        </FrameLayout>
-
-        <LinearLayout
-            android:id="@+id/vertical_fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-
-            <FrameLayout
-                android:id="@+id/headlines_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.5"
-                android:background="?headlinesBackgroundSolid" >
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/article_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:background="?articleBackground" 
-                android:layout_weight="0.5" >
-            </FrameLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:background="?loadingBackground"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/loading_message"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/feeds_row_selected.xml b/res/layout-xlarge/feeds_row_selected.xml
deleted file mode 100644
index d8481005..00000000
--- a/res/layout-xlarge/feeds_row_selected.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:background="?feedsSelectedBackground"
-    android:gravity="center_vertical"
-    android:id="@+id/feeds_row" android:layout_width="match_parent" android:paddingBottom="4dip" android:paddingLeft="8dip" android:paddingRight="8dip" android:paddingTop="4dip">
-
-    <ImageView
-        android:id="@+id/icon"
-		android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:scaleType="fitXY"
-        
-        android:layout_weight="0"
-        android:src="@drawable/ic_rss_bw" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"           
-            android:layout_gravity="center_vertical"    
-            android:paddingLeft="6dip" 
-            android:textColor="?feedlistSelectedTextColor"  
-            android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/>
-        <TextView
-            android:id="@+id/unread_counter"
-            android:gravity="right"
-            android:textStyle="bold"
-            android:paddingRight="12dp"
-            android:textColor="?unreadCounterColor"
-            android:layout_gravity="center_vertical"            
-            android:layout_width="wrap_content"
-            android:layout_weight="0"
-            android:layout_height="wrap_content"
-            android:text="{123}" android:textSize="13sp"/>
-                   
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row.xml b/res/layout-xlarge/headlines_row.xml
deleted file mode 100644
index bb673f9f..00000000
--- a/res/layout-xlarge/headlines_row.xml
+++ /dev/null
@@ -1,141 +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" >
-
-
-    <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="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="?headlineTextColor"
-                android:text="{Title...}"
-                android:textSize="16sp" >
-            </TextView>
-
-            <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>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </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_gravity="right"
-        android:background="@android:color/transparent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-        
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row_selected.xml b/res/layout-xlarge/headlines_row_selected.xml
deleted file mode 100644
index 5df99772..00000000
--- a/res/layout-xlarge/headlines_row_selected.xml
+++ /dev/null
@@ -1,141 +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" >
-
-    <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="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="?headlineSelectedTextColor"
-                android:text="{Title...}"
-                android:textSize="16sp" >
-            </TextView>
-
-            <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>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineSelectedExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </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_gravity="right"
-        android:background="@android:color/transparent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-        
-        
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row_unread.xml b/res/layout-xlarge/headlines_row_unread.xml
deleted file mode 100644
index 5ccac557..00000000
--- a/res/layout-xlarge/headlines_row_unread.xml
+++ /dev/null
@@ -1,141 +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" >
-
-    <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="6dip"
-            android:paddingRight="6dip" >
-        </CheckBox>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="{Title...}"
-                android:textColor="?headlineUnreadTextColor"
-                android:textSize="16sp" >
-            </TextView>
-
-            <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>
-
-        <LinearLayout
-            android:id="@+id/linerLayout3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="3dip" >
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Jan 01"
-                android:textColor="?headlineExcerptTextColor"
-                android:textSize="13sp" >
-            </TextView>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingRight="2sp" >
-
-                <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>
-
-                <ImageView
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    android:src="@drawable/ic_rss_bw" >
-                </ImageView>
-            </LinearLayout>
-        </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_gravity="right"
-        android:background="@android:color/transparent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-        
-        
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml
deleted file mode 100644
index 9df4e048..00000000
--- a/res/layout-xlarge/main.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-
-    <LinearLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal" >
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.3"
-            android:background="?feedlistBackground" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:background="?headlinesBackground" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.6"
-            android:background="?articleBackground" >
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?loadingBackground"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/loading_message"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index f6aa339a..57de0cf3 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
+import android.view.Display;
 import android.widget.Toast;
 
 public class CommonActivity extends FragmentActivity {
@@ -70,8 +71,13 @@ public class CommonActivity extends FragmentActivity {
 		return m_compatMode;
 	}
 
-	public int getOrientation() {
-		return getWindowManager().getDefaultDisplay().getOrientation();
+	public boolean isPortrait() {
+		Display display = getWindowManager().getDefaultDisplay(); 
+		
+	    int width = display.getWidth();
+	    int height = display.getHeight();
+		
+	    return width < height;
 	}
 
 	public void copyToClipboard(String str) {
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 6e24aa64..8e861667 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -146,7 +146,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 		//list.setEmptyView(view.findViewById(R.id.no_headlines));
 		registerForContextMenu(list);
 
-		if (m_onlineServices.isSmallScreen() || m_onlineServices.getOrientation() % 2 != 0)
+		if (m_onlineServices.isSmallScreen() || m_onlineServices.isPortrait())
 			view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0);
 
 		Log.d(TAG, "onCreateView, feed=" + m_feed);
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 5cb281ef..6f4f4348 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -660,7 +660,7 @@ public class MainActivity extends CommonActivity implements OnlineServices {
 		if (!isCompatMode()) {
 			
 			if (!isSmallScreen()) {				
-				findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticle != null && getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE);
+				findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticle != null && isPortrait() ? View.GONE : View.VISIBLE);
 				findViewById(R.id.article_fragment).setVisibility(m_selectedArticle != null ? View.VISIBLE : View.GONE);
 			}
 			
@@ -1414,7 +1414,7 @@ public class MainActivity extends CommonActivity implements OnlineServices {
 			
 			m_navigationAdapter.clear();
 
-			if (m_activeCategory != null || (m_activeFeed != null && (isSmallScreen() || getOrientation() % 2 != 0))) {
+			if (m_activeCategory != null || (m_activeFeed != null && (isSmallScreen() || isPortrait()))) {
 				getActionBar().setDisplayShowTitleEnabled(false);
 				getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
 				
@@ -1862,11 +1862,11 @@ public class MainActivity extends CommonActivity implements OnlineServices {
 			ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES));
 			ft.add(R.id.fragment_container, frag, FRAG_ARTICLE);
 		} else {
-			findViewById(R.id.feeds_fragment).setVisibility(getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE);
+			findViewById(R.id.feeds_fragment).setVisibility(isPortrait() ? View.GONE : View.VISIBLE);
 			findViewById(R.id.article_fragment).setVisibility(View.VISIBLE);
 			ft.replace(R.id.article_fragment, frag, FRAG_ARTICLE);
 			
-			if (getOrientation() % 2 == 0) refresh();
+			if (!isPortrait()) refresh();
 		}
 		ft.commit();
 	}
diff --git a/src/org/fox/ttrss/OnlineServices.java b/src/org/fox/ttrss/OnlineServices.java
index 330751a2..32399831 100644
--- a/src/org/fox/ttrss/OnlineServices.java
+++ b/src/org/fox/ttrss/OnlineServices.java
@@ -25,7 +25,7 @@ public interface OnlineServices {
 	public boolean isSmallScreen();
 	public boolean getUnreadOnly();
 	public int getApiLevel();
-	public int getOrientation();
+	public boolean isPortrait();
 	
 	public void copyToClipboard(String str);
 }
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index 24899907..c26c4904 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -292,7 +292,7 @@ public class OfflineActivity extends CommonActivity implements
 
 		if (!isCompatMode()) {
 			if (!isSmallScreen()) {
-				findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticleId != 0 && getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE);
+				findViewById(R.id.feeds_fragment).setVisibility(m_selectedArticleId != 0 && isPortrait() ? View.GONE : View.VISIBLE);
 				findViewById(R.id.article_fragment).setVisibility(m_selectedArticleId != 0 ? View.VISIBLE : View.GONE);
 			}
 			
@@ -1397,7 +1397,7 @@ public class OfflineActivity extends CommonActivity implements
 			ft.hide(getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES));
 			ft.add(R.id.fragment_container, frag, FRAG_ARTICLE);
 		} else {
-			findViewById(R.id.feeds_fragment).setVisibility(getOrientation() % 2 != 0 ? View.GONE : View.VISIBLE);
+			findViewById(R.id.feeds_fragment).setVisibility(isPortrait() ? View.GONE : View.VISIBLE);
 			findViewById(R.id.article_fragment).setVisibility(View.VISIBLE);			
 			ft.replace(R.id.article_fragment, frag, FRAG_ARTICLE);
 			
@@ -1445,7 +1445,7 @@ public class OfflineActivity extends CommonActivity implements
 			
 			m_navigationAdapter.clear();
 
-			if (m_activeCatId != -1 || (m_activeFeedId != 0 && (isSmallScreen() || getOrientation() % 2 != 0))) {
+			if (m_activeCatId != -1 || (m_activeFeedId != 0 && (isSmallScreen() || isPortrait()))) {
 				getActionBar().setDisplayShowTitleEnabled(false);
 				getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
 				
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 40d42eb1..e5428f59 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -150,7 +150,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		list.setEmptyView(view.findViewById(R.id.no_headlines));
 		registerForContextMenu(list);
 
-		if (m_offlineServices.isSmallScreen() || m_offlineServices.getOrientation() % 2 != 0)
+		if (m_offlineServices.isSmallScreen() || m_offlineServices.isPortrait())
 			view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0);
 		
 		getActivity().setProgressBarIndeterminateVisibility(false);
diff --git a/src/org/fox/ttrss/offline/OfflineServices.java b/src/org/fox/ttrss/offline/OfflineServices.java
index 76a8a308..8483c97f 100644
--- a/src/org/fox/ttrss/offline/OfflineServices.java
+++ b/src/org/fox/ttrss/offline/OfflineServices.java
@@ -18,5 +18,5 @@ public interface OfflineServices {
 	public boolean isSmallScreen();
 	public void setSelectedArticleId(int articleId);
 	public boolean activeFeedIsCat();
-	public int getOrientation();
+	public boolean isPortrait();
 }
-- 
cgit v1.2.3-54-g00ecf