aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout-w360dp/fragment_conversations_overview.xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
committersteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
commit20eae3955700341188bc1907a506970f5817a153 (patch)
tree6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/layout-w360dp/fragment_conversations_overview.xml
parent980a84a6ce4358e8662addf203695e01d9f931dc (diff)
parentecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff)
Merge master-origin
Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/layout-w360dp/fragment_conversations_overview.xml')
-rw-r--r--src/main/res/layout-w360dp/fragment_conversations_overview.xml30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/main/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
deleted file mode 100644
index a600118d..00000000
--- a/src/main/res/layout-w360dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.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="300dp"
- android:layout_height="match_parent"
- android:background="@color/primarybackground"
- android:orientation="vertical" >
-
- <ListView
- android:id="@+id/list"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@color/primarybackground"
- android:divider="@color/divider"
- android:dividerHeight="1dp" />
- </LinearLayout>
-
- <LinearLayout
- 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