From 68375163f57ba3b2adebca3f320478309a48f7ef Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 23 May 2016 22:18:13 +0200
Subject: [PATCH] only use swap header image on large screens

The previous logic was putting the header on some 4" screens while not
putting it on a 7" tablet.  Tested with:

* Samsung Galaxy Tab 3 7"
* Azpen A727 7"
* Xiaomi 4.5"
* Lenovo 4"
* emulators...
---
 .../res/layout-ldpi/start_swap_header.xml     |  7 ----
 .../res/layout-small/start_swap_header.xml    |  7 ----
 .../res/layout-sw480dp/start_swap_header.xml  | 32 +++++++++++++++++++
 app/src/main/res/layout/start_swap_header.xml | 29 ++---------------
 4 files changed, 34 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/res/layout-ldpi/start_swap_header.xml
 delete mode 100644 app/src/main/res/layout-small/start_swap_header.xml
 create mode 100644 app/src/main/res/layout-sw480dp/start_swap_header.xml

diff --git a/app/src/main/res/layout-ldpi/start_swap_header.xml b/app/src/main/res/layout-ldpi/start_swap_header.xml
deleted file mode 100644
index 2f8a78fdc..000000000
--- a/app/src/main/res/layout-ldpi/start_swap_header.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentTop="true">
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-small/start_swap_header.xml b/app/src/main/res/layout-small/start_swap_header.xml
deleted file mode 100644
index 2f8a78fdc..000000000
--- a/app/src/main/res/layout-small/start_swap_header.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentTop="true">
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw480dp/start_swap_header.xml b/app/src/main/res/layout-sw480dp/start_swap_header.xml
new file mode 100644
index 000000000..a3163d65f
--- /dev/null
+++ b/app/src/main/res/layout-sw480dp/start_swap_header.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/header"
+    android:layout_width="match_parent"
+    android:layout_height="130dp"
+    android:layout_alignParentTop="true"
+    tools:showIn="@layout/swap_blank">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/swap_start_header" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:padding="20dp"
+        android:paddingLeft="30dp"
+        android:paddingRight="30dp"
+        android:paddingEnd="30dp"
+        android:gravity="center"
+        android:textAlignment="center"
+        android:text="@string/swap_intro"
+        android:textColor="@android:color/white"
+        android:textSize="18sp"
+        tools:ignore="UnusedAttribute" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/start_swap_header.xml b/app/src/main/res/layout/start_swap_header.xml
index a3163d65f..2f8a78fdc 100644
--- a/app/src/main/res/layout/start_swap_header.xml
+++ b/app/src/main/res/layout/start_swap_header.xml
@@ -1,32 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/header"
     android:layout_width="match_parent"
-    android:layout_height="130dp"
-    android:layout_alignParentTop="true"
-    tools:showIn="@layout/swap_blank">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/swap_start_header" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:padding="20dp"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp"
-        android:paddingEnd="30dp"
-        android:gravity="center"
-        android:textAlignment="center"
-        android:text="@string/swap_intro"
-        android:textColor="@android:color/white"
-        android:textSize="18sp"
-        tools:ignore="UnusedAttribute" />
-
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true">
 </RelativeLayout>
\ No newline at end of file