aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2014-10-21 00:01:16 -0700
committerKenny Root <kenny@the-b.org>2014-10-21 00:02:26 -0700
commitd2c6c2d7d487fc38f2126af042667aed510c9300 (patch)
tree2d612c13bd93edda2fecb41ac14b8c0440597295 /res
parentb0e8d90a43adf8503775857ec7bd1f68b19d3dc2 (diff)
downloadconnectbot-d2c6c2d7d487fc38f2126af042667aed510c9300.tar.gz
connectbot-d2c6c2d7d487fc38f2126af042667aed510c9300.tar.bz2
connectbot-d2c6c2d7d487fc38f2126af042667aed510c9300.zip
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
Diffstat (limited to 'res')
-rw-r--r--res/layout/act_hostlist.xml43
1 files changed, 27 insertions, 16 deletions
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>