aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/res/layout-w945dp/fragment_conversations_overview.xml21
-rw-r--r--src/main/res/layout/fragment_conversations_overview.xml3
2 files changed, 12 insertions, 12 deletions
diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
index c6cc7d7c2..127264945 100644
--- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
@@ -1,14 +1,12 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.SlidingPaneLayout 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">
+ android:layout_height="match_parent">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
android:layout_weight="1"
+ android:layout_height="match_parent"
android:background="@color/grey50"
android:orientation="vertical">
@@ -23,9 +21,10 @@
<LinearLayout
android:id="@+id/selected_conversation"
- android:layout_width="0dp"
- android:layout_weight="2"
+ android:layout_width="fill_parent"
android:layout_height="match_parent"
- android:orientation="vertical"></LinearLayout>
+ android:layout_weight="2"
+ android:orientation="vertical">
+ </LinearLayout>
-</LinearLayout> \ No newline at end of file
+</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 90327136b..e74e0e533 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -24,6 +24,7 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:orientation="vertical"></LinearLayout>
+ android:orientation="vertical">
+ </LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file