diff options
| author | Kenny Root <kenny@the-b.org> | 2014-10-21 00:07:33 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2014-10-21 00:07:33 -0700 |
| commit | b084808891519ae945bda86540b5c5941f1dcad9 (patch) | |
| tree | 87352394ce7121ee53a34f0ab3284fe2be2d374e /app/src | |
| parent | b0da2f22a327b698a536027c4b5fb0278e4f1e33 (diff) | |
| parent | d2c6c2d7d487fc38f2126af042667aed510c9300 (diff) | |
| download | connectbot-b084808891519ae945bda86540b5c5941f1dcad9.tar.gz connectbot-b084808891519ae945bda86540b5c5941f1dcad9.tar.bz2 connectbot-b084808891519ae945bda86540b5c5941f1dcad9.zip | |
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/res/layout/act_hostlist.xml | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml index 80d1583..3c6f4b1 100644 --- a/app/src/main/res/layout/act_hostlist.xml +++ b/app/src/main/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> |