From d94c231a744900ca7a1297ffd0980536591d61f5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 28 Apr 2015 16:25:32 +0200
Subject: adjust dimens slightly to work with v21+ (v21 doesn't count the
 navigation bar)

---
 .../fragment_conversations_overview.xml            | 32 ++++++++++++++++++++++
 .../fragment_conversations_overview.xml            | 32 ----------------------
 src/main/res/values-w585dp/dimens.xml              |  4 +++
 src/main/res/values-w600dp/dimens.xml              |  4 ---
 src/main/res/values-w945dp/dimens.xml              |  3 ++
 src/main/res/values-w960dp/dimens.xml              |  3 --
 6 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 src/main/res/layout-w945dp/fragment_conversations_overview.xml
 delete mode 100644 src/main/res/layout-w960dp/fragment_conversations_overview.xml
 create mode 100644 src/main/res/values-w585dp/dimens.xml
 delete mode 100644 src/main/res/values-w600dp/dimens.xml
 create mode 100644 src/main/res/values-w945dp/dimens.xml
 delete mode 100644 src/main/res/values-w960dp/dimens.xml

(limited to 'src/main/res')

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..50039c03
--- /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/primarybackground"
+        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/primarybackground"
+            android:divider="@color/divider"
+            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
diff --git a/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
deleted file mode 100644
index 50039c03..00000000
--- a/src/main/res/layout-w960dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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/primarybackground"
-        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/primarybackground"
-            android:divider="@color/divider"
-            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
diff --git a/src/main/res/values-w585dp/dimens.xml b/src/main/res/values-w585dp/dimens.xml
new file mode 100644
index 00000000..df6525e6
--- /dev/null
+++ b/src/main/res/values-w585dp/dimens.xml
@@ -0,0 +1,4 @@
+<resources>
+	<dimen name="conversations_overview_width">416dp</dimen>
+    <dimen name="activity_horizontal_margin">32dp</dimen>
+</resources>
diff --git a/src/main/res/values-w600dp/dimens.xml b/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index df6525e6..00000000
--- a/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-	<dimen name="conversations_overview_width">416dp</dimen>
-    <dimen name="activity_horizontal_margin">32dp</dimen>
-</resources>
diff --git a/src/main/res/values-w945dp/dimens.xml b/src/main/res/values-w945dp/dimens.xml
new file mode 100644
index 00000000..146c0e15
--- /dev/null
+++ b/src/main/res/values-w945dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/src/main/res/values-w960dp/dimens.xml b/src/main/res/values-w960dp/dimens.xml
deleted file mode 100644
index 146c0e15..00000000
--- a/src/main/res/values-w960dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
-- 
cgit v1.2.3