aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-07-15 13:48:05 -0700
committerKenny Root <kenny@the-b.org>2015-07-15 13:48:50 -0700
commit0703c9a0a5a0124dec6bb4c8ab6fa95290214051 (patch)
tree63c35d42e471f299f7040ecd564544e1643b0196 /app/src/main/res
parent00f1b72db97a554432a2d04520ca52a402ffa910 (diff)
parent3627d32b8fb41647a9bce7edbd2579a3e1ad1448 (diff)
downloadconnectbot-0703c9a0a5a0124dec6bb4c8ab6fa95290214051.tar.gz
connectbot-0703c9a0a5a0124dec6bb4c8ab6fa95290214051.tar.bz2
connectbot-0703c9a0a5a0124dec6bb4c8ab6fa95290214051.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/button_tab.pngbin0 -> 3535 bytes
-rw-r--r--app/src/main/res/layout/act_console.xml11
-rw-r--r--app/src/main/res/layout/act_hostlist.xml8
-rw-r--r--app/src/main/res/values/strings.xml4
4 files changed, 18 insertions, 5 deletions
diff --git a/app/src/main/res/drawable/button_tab.png b/app/src/main/res/drawable/button_tab.png
new file mode 100644
index 0000000..4443118
--- /dev/null
+++ b/app/src/main/res/drawable/button_tab.png
Binary files differ
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index f7db787..46dedfb 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -158,6 +158,17 @@
android:src="@+drawable/button_esc"
android:contentDescription="@string/image_description_send_escape_character"
/>
+
+ <ImageView
+ android:id="@+id/button_tab"
+ android:paddingRight="15dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@+id/button_esc"
+ android:layout_alignParentBottom="true"
+ android:src="@+drawable/button_tab"
+ android:contentDescription="@string/image_description_send_tab_character"
+ />
</RelativeLayout>
diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml
index 3c6f4b1..3d46068 100644
--- a/app/src/main/res/layout/act_hostlist.xml
+++ b/app/src/main/res/layout/act_hostlist.xml
@@ -25,8 +25,9 @@
android:layout_height="fill_parent"
>
- <RelativeLayout
+ <LinearLayout
android:id="@+id/quickconnect"
+ android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
@@ -37,7 +38,6 @@
android:id="@+id/transport_selection"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_alignParentLeft="true"
/>
<EditText
@@ -45,14 +45,12 @@
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>
+ </LinearLayout>
<ListView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8e3bb5..cbc275c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -505,6 +505,10 @@
<!-- Describes the icon of the "send escape character" button in the terminal view for
accessibility purposes. -->
<string name="image_description_send_escape_character">Send escape character.</string>
+
+ <!-- Describes the icon of the "send tab character" button in the terminal view for
+ accessibility purposes. -->
+ <string name="image_description_send_tab_character">Send TAB character.</string>
<!-- Describes the icon of the "show keyboard" button in the terminal view for accessibility
purposes. -->