diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-w360dp/fragment_conversations_overview.xml (renamed from res/layout-sw600dp/fragment_conversations_overview.xml) | 8 | ||||
-rw-r--r-- | res/layout-w384dp/fragment_conversations_overview.xml (renamed from res/layout-sw384dp/fragment_conversations_overview.xml) | 2 | ||||
-rw-r--r-- | res/layout-w600dp/fragment_conversations_overview.xml (renamed from res/layout-sw360dp/fragment_conversations_overview.xml) | 4 | ||||
-rw-r--r-- | res/layout-w960dp/fragment_conversations_overview.xml (renamed from res/layout-sw720dp/fragment_conversations_overview.xml) | 13 | ||||
-rw-r--r-- | res/layout/fragment_conversations_overview.xml | 2 |
5 files changed, 14 insertions, 15 deletions
diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-w360dp/fragment_conversations_overview.xml index 5dfdceff..a639ed56 100644 --- a/res/layout-sw600dp/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" +<eu.siacs.conversations.ui.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android" + 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="240dp" + android:layout_width="300dp" android:layout_height="match_parent" android:background="@color/primarybackground" android:orientation="vertical" > @@ -27,4 +27,4 @@ android:orientation="vertical" > </LinearLayout> -</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file +</eu.siacs.conversations.ui.SlidingPaneLayout>
\ No newline at end of file diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-w384dp/fragment_conversations_overview.xml index 2a422052..c3aa67ae 100644 --- a/res/layout-sw384dp/fragment_conversations_overview.xml +++ b/res/layout-w384dp/fragment_conversations_overview.xml @@ -1,5 +1,5 @@ <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" > diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-w600dp/fragment_conversations_overview.xml index ef8a1b6e..331fb1f0 100644 --- a/res/layout-sw360dp/fragment_conversations_overview.xml +++ b/res/layout-w600dp/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="400dp" android:layout_height="match_parent" android:background="@color/primarybackground" android:orientation="vertical" > diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-w960dp/fragment_conversations_overview.xml index bc52ec46..5309674b 100644 --- a/res/layout-sw720dp/fragment_conversations_overview.xml +++ b/res/layout-w960dp/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" +<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:layout_height="match_parent" + android:orientation="horizontal"> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="288dp" + android:layout_width="320dp" android:layout_height="match_parent" android:background="@color/primarybackground" android:orientation="vertical" > @@ -23,8 +23,7 @@ android:id="@+id/selected_conversation" android:layout_width="fill_parent" android:layout_height="match_parent" - android:layout_weight="1" android:orientation="vertical" > </LinearLayout> -</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml index bc52ec46..d4145761 100644 --- a/res/layout/fragment_conversations_overview.xml +++ b/res/layout/fragment_conversations_overview.xml @@ -1,5 +1,5 @@ <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" > |