aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout-w360dp
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-10 10:52:21 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-10 10:52:21 +0200
commit15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch)
tree9a2152390f39c4a9c79490a0938f57fe728140f2 /res/layout-w360dp
parentae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff)
parent331be08859d68fa6a034b39c674fd7bb929c4a5c (diff)
Merge branch 'development'
Diffstat (limited to '')
-rw-r--r--res/layout-w360dp/fragment_conversations_overview.xml (renamed from res/layout-sw360dp/fragment_conversations_overview.xml)4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-w360dp/fragment_conversations_overview.xml
index ef8a1b6e..a600118d 100644
--- a/res/layout-sw360dp/fragment_conversations_overview.xml
+++ b/res/layout-w360dp/fragment_conversations_overview.xml
@@ -1,11 +1,11 @@
<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/slidingpanelayout"
+ android:id="@+id/content_view_spl"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="324dp"
+ android:layout_width="300dp"
android:layout_height="match_parent"
android:background="@color/primarybackground"
android:orientation="vertical" >