From 8fd688ca96005152be754eeba1be72c7c0aab9ad Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 11 Aug 2015 17:35:53 +0200
Subject: Merge tag '1.5.2' into trz/rebase

---
 .../fragment_conversations_overview.xml            | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/main/res/layout-w945dp/fragment_conversations_overview.xml

(limited to 'src/main/res/layout-w945dp')

diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
new file mode 100644
index 00000000..7ae1788d
--- /dev/null
+++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
@@ -0,0 +1,32 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_view_ll"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:baselineAligned="false">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="@color/grey50"
+        android:orientation="vertical" >
+
+        <de.timroes.android.listview.EnhancedListView
+            android:id="@+id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/grey50"
+            android:divider="@color/black12"
+            android:dividerHeight="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selected_conversation"
+        android:layout_width="0dp"
+        android:layout_weight="2"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3