From df0c03abd8c30e70bcb5b79167f0919faefad0bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 7 Feb 2015 16:35:44 +0300
Subject: add fix for sidebar not showing/hiding properly on tablets because of
 activity not being recreated on orientation change (this is needed to restore
 webview/fsview state)

---
 .../src/main/res/layout-sw600dp-port/headlines.xml | 36 -------------------
 .../res/layout-sw600dp-port/headlines_articles.xml | 41 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 36 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml

(limited to 'org.fox.ttrss/src/main/res/layout-sw600dp-port')

diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
deleted file mode 100644
index 01737c68..00000000
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fitsSystemWindows="true">
-
-    <FrameLayout
-        android:id="@+id/sw600dp_port_anchor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" >
-    </FrameLayout>
-
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/headlines_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?headlinesBackground">
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="300dp"
-            android:layout_gravity="start"
-            android:background="?feedlistBackground"
-            android:layout_height="match_parent" >
-        </FrameLayout>
-
-    </android.support.v4.widget.DrawerLayout>
-
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
new file mode 100644
index 00000000..f4ff2c59
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
@@ -0,0 +1,41 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines"
+    android:fitsSystemWindows="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <FrameLayout
+        android:id="@+id/sw600dp_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:paddingRight="4dp"
+            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:elevation="4dp"
+            android:background="?articleBackground" >
+        </FrameLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3