From d2c6c2d7d487fc38f2126af042667aed510c9300 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 21 Oct 2014 00:01:16 -0700
Subject: Wrap quick connect bar in layout

On Lollipop, this would otherwise result in an EditText that was cut off
by the layout.

Change-Id: I0c116aaf5b86da0409b57d3c89efa7f60b3b2160
---
 res/layout/act_hostlist.xml | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'res')

diff --git a/res/layout/act_hostlist.xml b/res/layout/act_hostlist.xml
index 80d1583..3c6f4b1 100644
--- a/res/layout/act_hostlist.xml
+++ b/res/layout/act_hostlist.xml
@@ -25,30 +25,41 @@
 	android:layout_height="fill_parent"
 	>
 
-	<Spinner
-		android:id="@+id/transport_selection"
+	<RelativeLayout
+		android:id="@+id/quickconnect"
+		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"
 		android:layout_alignParentBottom="true"
 		android:layout_alignParentLeft="true"
-		/>
+		>
+
+		<Spinner
+			android:id="@+id/transport_selection"
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
+			android:layout_alignParentLeft="true"
+			/>
+
+		<EditText
+			android:id="@+id/front_quickconnect"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:hint="username@hostname:port"
+			android:layout_toRightOf="@+id/transport_selection"
+			android:layout_alignBaseline="@+id/transport_selection"
+			android:inputType="textEmailAddress"
+			android:maxLines="1"
+			android:ellipsize="end"
+			android:focusableInTouchMode="true"
+			android:singleLine="true"/>
+	</RelativeLayout>
 
-	<EditText
-		android:id="@+id/front_quickconnect"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:hint="username@hostname:port"
-		android:layout_toRightOf="@+id/transport_selection"
-		android:layout_alignTop="@+id/transport_selection"
-		android:inputType="textEmailAddress"
-		android:layout_alignBottom="@+id/transport_selection"
-		/>
 
 	<ListView
 		android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:layout_above="@+id/transport_selection"
+		android:layout_above="@+id/quickconnect"
 		/>
 
 	<TextView
@@ -58,7 +69,7 @@
 		android:text="@string/list_host_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:gravity="center"
-		android:layout_above="@+id/transport_selection"
+		android:layout_above="@+id/quickconnect"
 		/>
 
 </RelativeLayout>
-- 
cgit v1.2.3