From 531add53ae61b1ebf39a101919906f9913e5ec03 Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Mon, 5 Oct 2015 18:34:51 -0700
Subject: Lint fixes.

---
 app/src/main/java/org/connectbot/HelpActivity.java |   3 +-
 .../main/res/drawable-mdpi/gesture_hostnext.png    | Bin 0 -> 8161 bytes
 .../main/res/drawable-mdpi/gesture_hostprev.png    | Bin 0 -> 8232 bytes
 app/src/main/res/drawable-mdpi/gesture_pgdn.png    | Bin 0 -> 8434 bytes
 app/src/main/res/drawable-mdpi/gesture_pgup.png    | Bin 0 -> 8560 bytes
 .../main/res/drawable-mdpi/gesture_scrollback.png  | Bin 0 -> 9061 bytes
 .../res/drawable-mdpi/gesture_scrollforward.png    | Bin 0 -> 8691 bytes
 .../drawable-mdpi/highlight_disabled_pressed.9.png | Bin 0 -> 898 bytes
 app/src/main/res/drawable/gesture_hostnext.png     | Bin 8161 -> 0 bytes
 app/src/main/res/drawable/gesture_hostprev.png     | Bin 8232 -> 0 bytes
 app/src/main/res/drawable/gesture_pgdn.png         | Bin 8434 -> 0 bytes
 app/src/main/res/drawable/gesture_pgup.png         | Bin 8560 -> 0 bytes
 app/src/main/res/drawable/gesture_scrollback.png   | Bin 9061 -> 0 bytes
 .../main/res/drawable/gesture_scrollforward.png    | Bin 8691 -> 0 bytes
 .../res/drawable/highlight_disabled_pressed.9.png  | Bin 898 -> 0 bytes
 app/src/main/res/layout-sw500dp/act_hints.xml      | 403 ++++++++++-----------
 app/src/main/res/layout/act_hints.xml              | 329 ++++++++---------
 app/src/main/res/layout/dia_keyboard_shortcuts.xml |   6 +-
 app/src/main/res/values/strings.xml                |   6 +
 19 files changed, 373 insertions(+), 374 deletions(-)
 create mode 100644 app/src/main/res/drawable-mdpi/gesture_hostnext.png
 create mode 100644 app/src/main/res/drawable-mdpi/gesture_hostprev.png
 create mode 100644 app/src/main/res/drawable-mdpi/gesture_pgdn.png
 create mode 100644 app/src/main/res/drawable-mdpi/gesture_pgup.png
 create mode 100644 app/src/main/res/drawable-mdpi/gesture_scrollback.png
 create mode 100644 app/src/main/res/drawable-mdpi/gesture_scrollforward.png
 create mode 100644 app/src/main/res/drawable-mdpi/highlight_disabled_pressed.9.png
 delete mode 100644 app/src/main/res/drawable/gesture_hostnext.png
 delete mode 100644 app/src/main/res/drawable/gesture_hostprev.png
 delete mode 100644 app/src/main/res/drawable/gesture_pgdn.png
 delete mode 100644 app/src/main/res/drawable/gesture_pgup.png
 delete mode 100644 app/src/main/res/drawable/gesture_scrollback.png
 delete mode 100644 app/src/main/res/drawable/gesture_scrollforward.png
 delete mode 100644 app/src/main/res/drawable/highlight_disabled_pressed.9.png

(limited to 'app/src')

diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index 998dfe0..2a522dc 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -51,7 +51,8 @@ public class HelpActivity extends AppCompatActivity {
 		Button shortcutsButton = (Button) findViewById(R.id.shortcuts_button);
 		shortcutsButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
-				final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts, null, false);
+				final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts,
+						null, false);
 				new AlertDialog.Builder(HelpActivity.this)
 						.setView(shortcuts)
 						.setTitle(R.string.keyboard_shortcuts)
diff --git a/app/src/main/res/drawable-mdpi/gesture_hostnext.png b/app/src/main/res/drawable-mdpi/gesture_hostnext.png
new file mode 100644
index 0000000..624223d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/gesture_hostnext.png differ
diff --git a/app/src/main/res/drawable-mdpi/gesture_hostprev.png b/app/src/main/res/drawable-mdpi/gesture_hostprev.png
new file mode 100644
index 0000000..f99f70c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/gesture_hostprev.png differ
diff --git a/app/src/main/res/drawable-mdpi/gesture_pgdn.png b/app/src/main/res/drawable-mdpi/gesture_pgdn.png
new file mode 100644
index 0000000..61b769b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/gesture_pgdn.png differ
diff --git a/app/src/main/res/drawable-mdpi/gesture_pgup.png b/app/src/main/res/drawable-mdpi/gesture_pgup.png
new file mode 100644
index 0000000..0e7f1ca
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/gesture_pgup.png differ
diff --git a/app/src/main/res/drawable-mdpi/gesture_scrollback.png b/app/src/main/res/drawable-mdpi/gesture_scrollback.png
new file mode 100644
index 0000000..714e626
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/gesture_scrollback.png differ
diff --git a/app/src/main/res/drawable-mdpi/gesture_scrollforward.png b/app/src/main/res/drawable-mdpi/gesture_scrollforward.png
new file mode 100644
index 0000000..0172e45
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/gesture_scrollforward.png differ
diff --git a/app/src/main/res/drawable-mdpi/highlight_disabled_pressed.9.png b/app/src/main/res/drawable-mdpi/highlight_disabled_pressed.9.png
new file mode 100644
index 0000000..807fcb5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/highlight_disabled_pressed.9.png differ
diff --git a/app/src/main/res/drawable/gesture_hostnext.png b/app/src/main/res/drawable/gesture_hostnext.png
deleted file mode 100644
index 624223d..0000000
Binary files a/app/src/main/res/drawable/gesture_hostnext.png and /dev/null differ
diff --git a/app/src/main/res/drawable/gesture_hostprev.png b/app/src/main/res/drawable/gesture_hostprev.png
deleted file mode 100644
index f99f70c..0000000
Binary files a/app/src/main/res/drawable/gesture_hostprev.png and /dev/null differ
diff --git a/app/src/main/res/drawable/gesture_pgdn.png b/app/src/main/res/drawable/gesture_pgdn.png
deleted file mode 100644
index 61b769b..0000000
Binary files a/app/src/main/res/drawable/gesture_pgdn.png and /dev/null differ
diff --git a/app/src/main/res/drawable/gesture_pgup.png b/app/src/main/res/drawable/gesture_pgup.png
deleted file mode 100644
index 0e7f1ca..0000000
Binary files a/app/src/main/res/drawable/gesture_pgup.png and /dev/null differ
diff --git a/app/src/main/res/drawable/gesture_scrollback.png b/app/src/main/res/drawable/gesture_scrollback.png
deleted file mode 100644
index 714e626..0000000
Binary files a/app/src/main/res/drawable/gesture_scrollback.png and /dev/null differ
diff --git a/app/src/main/res/drawable/gesture_scrollforward.png b/app/src/main/res/drawable/gesture_scrollforward.png
deleted file mode 100644
index 0172e45..0000000
Binary files a/app/src/main/res/drawable/gesture_scrollforward.png and /dev/null differ
diff --git a/app/src/main/res/drawable/highlight_disabled_pressed.9.png b/app/src/main/res/drawable/highlight_disabled_pressed.9.png
deleted file mode 100644
index 807fcb5..0000000
Binary files a/app/src/main/res/drawable/highlight_disabled_pressed.9.png and /dev/null differ
diff --git a/app/src/main/res/layout-sw500dp/act_hints.xml b/app/src/main/res/layout-sw500dp/act_hints.xml
index d0b82e2..9a32dea 100644
--- a/app/src/main/res/layout-sw500dp/act_hints.xml
+++ b/app/src/main/res/layout-sw500dp/act_hints.xml
@@ -15,248 +15,247 @@
   ~ limitations under the License.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context="org.connectbot.HintsActivity">
 
-	<ScrollView
+	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:padding="10dip"
 		>
 
-		<LinearLayout
+		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="10dip"
-			>
+			android:text="@string/host_shortcuts_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
 
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/host_shortcuts_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/host_shortcuts_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
 
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/host_shortcuts_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/scroll_hints_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
 
-			<TextView
-				android:layout_width="fill_parent"
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/scroll_hints_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
+
+		<RelativeLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center">
+			<ImageView
+				android:id="@+id/scrollback_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/scroll_hints_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
+				android:src="@drawable/gesture_scrollback"
+				android:contentDescription="@string/scrolling_back"
+				android:layout_marginTop="10dp"
+				android:layout_marginRight="10dp"
+				android:layout_marginEnd="10dp"
+				android:layout_gravity="center_horizontal"/>
 
 			<TextView
-				android:layout_width="fill_parent"
+				android:id="@+id/scrollback_text"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:text="@string/scroll_hints_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
+				android:text="@string/scrolling_back"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:layout_marginBottom="5dp"
+				android:layout_alignStart="@id/scrollback_image"
+				android:layout_alignLeft="@id/scrollback_image"
+				android:layout_alignEnd="@id/scrollback_image"
+				android:layout_alignRight="@id/scrollback_image"
+				android:layout_below="@id/scrollback_image"
+				android:gravity="center_horizontal"/>
 
-			<RelativeLayout
-				android:layout_width="fill_parent"
+			<ImageView
+				android:id="@+id/scrollforward_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:gravity="center">
-				<ImageView
-					android:id="@+id/scrollback_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/gesture_scrollback"
-					android:contentDescription="@string/scrolling_back"
-					android:layout_marginTop="10dp"
-					android:layout_marginRight="10dp"
-					android:layout_gravity="center_horizontal"/>
+				android:src="@drawable/gesture_scrollforward"
+				android:contentDescription="@string/scrolling_forward"
+				android:layout_marginTop="10dp"
+				android:layout_marginLeft="10dp"
+				android:layout_marginStart="10dp"
+				android:layout_toRightOf="@id/scrollback_image"
+				android:layout_toEndOf="@id/scrollback_image"/>
 
-				<TextView
-					android:id="@+id/scrollback_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="@string/scrolling_back"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:layout_marginBottom="5dp"
-					android:layout_alignStart="@id/scrollback_image"
-					android:layout_alignLeft="@id/scrollback_image"
-					android:layout_alignEnd="@id/scrollback_image"
-					android:layout_alignRight="@id/scrollback_image"
-					android:layout_below="@id/scrollback_image"
-					android:gravity="center_horizontal"/>
+			<TextView
+				android:id="@+id/scrollforward_text"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:text="@string/scrolling_forward"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:layout_marginBottom="5dp"
+				android:layout_below="@id/scrollforward_image"
+				android:layout_alignStart="@id/scrollforward_image"
+				android:layout_alignLeft="@id/scrollforward_image"
+				android:layout_alignEnd="@id/scrollforward_image"
+				android:layout_alignRight="@id/scrollforward_image"
+				android:gravity="center_horizontal"/>
+		</RelativeLayout>
 
-				<ImageView
-					android:id="@+id/scrollforward_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/gesture_scrollforward"
-					android:contentDescription="@string/scrolling_forward"
-					android:layout_marginTop="10dp"
-					android:layout_marginLeft="10dp"
-					android:layout_toRightOf="@id/scrollback_image"
-					android:layout_toEndOf="@id/scrollback_image"/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/page_updn_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
 
-				<TextView
-					android:id="@+id/scrollforward_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="@string/scrolling_forward"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:layout_marginBottom="5dp"
-					android:layout_below="@id/scrollforward_image"
-					android:layout_alignStart="@id/scrollforward_image"
-					android:layout_alignLeft="@id/scrollforward_image"
-					android:layout_alignEnd="@id/scrollforward_image"
-					android:layout_alignRight="@id/scrollforward_image"
-					android:gravity="center_horizontal"/>
-			</RelativeLayout>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/page_updn_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
 
-			<TextView
-				android:layout_width="fill_parent"
+		<RelativeLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center">
+			<ImageView
+				android:id="@+id/pgup_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/page_updn_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
+				android:src="@drawable/gesture_pgup"
+				android:contentDescription="@string/page_up"
+				android:layout_marginTop="10dp"
+				android:layout_marginRight="10dp"
+				android:layout_marginEnd="10dp"
+				android:layout_gravity="center_horizontal"/>
 
 			<TextView
-				android:layout_width="fill_parent"
+				android:id="@+id/pgup_text"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:text="@string/page_updn_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
+				android:text="@string/page_up"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:layout_marginBottom="5dp"
+				android:layout_alignStart="@id/pgup_image"
+				android:layout_alignLeft="@id/pgup_image"
+				android:layout_alignEnd="@id/pgup_image"
+				android:layout_alignRight="@id/pgup_image"
+				android:layout_below="@id/pgup_image"
+				android:gravity="center_horizontal"/>
 
-			<RelativeLayout
-				android:layout_width="fill_parent"
+			<ImageView
+				android:id="@+id/pgdn_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:gravity="center">
-				<ImageView
-					android:id="@+id/pgup_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/gesture_pgup"
-					android:contentDescription="@string/page_up"
-					android:layout_marginTop="10dp"
-					android:layout_marginRight="10dp"
-					android:layout_gravity="center_horizontal"/>
+				android:src="@drawable/gesture_pgdn"
+				android:contentDescription="@string/page_down"
+				android:layout_marginTop="10dp"
+				android:layout_marginLeft="10dp"
+				android:layout_marginStart="10dp"
+				android:layout_toRightOf="@id/pgup_image"
+				android:layout_toEndOf="@id/pgup_image"/>
 
-				<TextView
-					android:id="@+id/pgup_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="@string/page_up"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:layout_marginBottom="5dp"
-					android:layout_alignStart="@id/pgup_image"
-					android:layout_alignLeft="@id/pgup_image"
-					android:layout_alignEnd="@id/pgup_image"
-					android:layout_alignRight="@id/pgup_image"
-					android:layout_below="@id/pgup_image"
-					android:gravity="center_horizontal"/>
+			<TextView
+				android:id="@+id/pgdn_text"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:text="@string/page_down"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:layout_marginBottom="5dp"
+				android:layout_below="@id/pgdn_image"
+				android:layout_alignStart="@id/pgdn_image"
+				android:layout_alignLeft="@id/pgdn_image"
+				android:layout_alignEnd="@id/pgdn_image"
+				android:layout_alignRight="@id/pgdn_image"
+				android:gravity="center_horizontal"/>
+		</RelativeLayout>
 
-				<ImageView
-					android:id="@+id/pgdn_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/gesture_pgdn"
-					android:contentDescription="@string/page_down"
-					android:layout_marginTop="10dp"
-					android:layout_marginLeft="10dp"
-					android:layout_toRightOf="@id/pgup_image"
-					android:layout_toEndOf="@id/pgup_image"/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/switching_hosts_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
 
-				<TextView
-					android:id="@+id/pgdn_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="@string/page_down"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:layout_marginBottom="5dp"
-					android:layout_below="@id/pgdn_image"
-					android:layout_alignStart="@id/pgdn_image"
-					android:layout_alignLeft="@id/pgdn_image"
-					android:layout_alignEnd="@id/pgdn_image"
-					android:layout_alignRight="@id/pgdn_image"
-					android:gravity="center_horizontal"/>
-			</RelativeLayout>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/switching_hosts_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
 
-			<TextView
-				android:layout_width="fill_parent"
+		<RelativeLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center">
+			<ImageView
+				android:id="@+id/prev_host_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/switching_hosts_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
+				android:src="@drawable/gesture_hostprev"
+				android:contentDescription="@string/prev_host"
+				android:layout_marginTop="10dp"
+				android:layout_marginRight="10dp"
+				android:layout_marginEnd="10dp"
+				android:layout_gravity="center_horizontal"/>
 
 			<TextView
-				android:layout_width="fill_parent"
+				android:id="@+id/prev_host_text"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:text="@string/switching_hosts_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
+				android:text="@string/prev_host"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:layout_marginBottom="5dp"
+				android:layout_alignStart="@id/prev_host_image"
+				android:layout_alignLeft="@id/prev_host_image"
+				android:layout_alignEnd="@id/prev_host_image"
+				android:layout_alignRight="@id/prev_host_image"
+				android:layout_below="@id/prev_host_image"
+				android:gravity="center_horizontal"/>
 
-			<RelativeLayout
-				android:layout_width="fill_parent"
+			<ImageView
+				android:id="@+id/next_host_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:gravity="center">
-				<ImageView
-					android:id="@+id/prev_host_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/gesture_hostprev"
-					android:contentDescription="@string/prev_host"
-					android:layout_marginTop="10dp"
-					android:layout_marginRight="10dp"
-					android:layout_gravity="center_horizontal"/>
-
-				<TextView
-					android:id="@+id/prev_host_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="@string/prev_host"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:layout_marginBottom="5dp"
-					android:layout_alignStart="@id/prev_host_image"
-					android:layout_alignLeft="@id/prev_host_image"
-					android:layout_alignEnd="@id/prev_host_image"
-					android:layout_alignRight="@id/prev_host_image"
-					android:layout_below="@id/prev_host_image"
-					android:gravity="center_horizontal"/>
+				android:src="@drawable/gesture_hostnext"
+				android:contentDescription="@string/next_host"
+				android:layout_marginTop="10dp"
+				android:layout_marginLeft="10dp"
+				android:layout_marginStart="10dp"
+				android:layout_toRightOf="@id/prev_host_image"
+				android:layout_toEndOf="@id/prev_host_image"/>
 
-				<ImageView
-					android:id="@+id/next_host_image"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:src="@drawable/gesture_hostnext"
-					android:contentDescription="@string/next_host"
-					android:layout_marginTop="10dp"
-					android:layout_marginLeft="5dp"
-					android:layout_toRightOf="@id/prev_host_image"
-					android:layout_toEndOf="@id/prev_host_image"/>
-
-				<TextView
-					android:id="@+id/next_host_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="@string/next_host"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:layout_marginBottom="10dp"
-					android:layout_below="@id/next_host_image"
-					android:layout_alignStart="@id/next_host_image"
-					android:layout_alignLeft="@id/next_host_image"
-					android:layout_alignEnd="@id/next_host_image"
-					android:layout_alignRight="@id/next_host_image"
-					android:gravity="center_horizontal"/>
-			</RelativeLayout>
-
-		</LinearLayout>
+			<TextView
+				android:id="@+id/next_host_text"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:text="@string/next_host"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:layout_marginBottom="10dp"
+				android:layout_below="@id/next_host_image"
+				android:layout_alignStart="@id/next_host_image"
+				android:layout_alignLeft="@id/next_host_image"
+				android:layout_alignEnd="@id/next_host_image"
+				android:layout_alignRight="@id/next_host_image"
+				android:gravity="center_horizontal"/>
+		</RelativeLayout>
 
-	</ScrollView>
+	</LinearLayout>
 
-</RelativeLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/act_hints.xml b/app/src/main/res/layout/act_hints.xml
index 69475d9..2e45c37 100644
--- a/app/src/main/res/layout/act_hints.xml
+++ b/app/src/main/res/layout/act_hints.xml
@@ -15,182 +15,175 @@
   ~ limitations under the License.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context="org.connectbot.HintsActivity">
 
-	<ScrollView
+	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:padding="10dip"
 		>
 
-		<LinearLayout
+		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="10dip"
-			>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/host_shortcuts_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/host_shortcuts_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/scroll_hints_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/scroll_hints_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/gesture_scrollback"
-				android:contentDescription="@string/scrolling_back"
-				android:layout_marginTop="10dp"
-				android:layout_gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/scrolling_back"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginBottom="5dp"
-				android:gravity="center_horizontal"/>
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/gesture_scrollforward"
-				android:contentDescription="@string/scrolling_forward"
-				android:layout_marginTop="10dp"
-				android:layout_gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/scrolling_forward"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginBottom="5dp"
-				android:gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/page_updn_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/page_updn_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/gesture_pgup"
-				android:contentDescription="@string/page_up"
-				android:layout_marginTop="10dp"
-				android:layout_gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/page_up"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginBottom="5dp"
-				android:gravity="center_horizontal"/>
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/gesture_pgdn"
-				android:contentDescription="@string/page_down"
-				android:layout_marginTop="10dp"
-				android:layout_gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/page_down"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginBottom="5dp"
-				android:gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/switching_hosts_header"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginTop="10dp"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/switching_hosts_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="5dp"/>
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/gesture_hostprev"
-				android:contentDescription="@string/prev_host"
-				android:layout_marginTop="10dp"
-				android:layout_gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/prev_host"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginBottom="5dp"
-				android:gravity="center_horizontal"/>
-
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/gesture_hostnext"
-				android:contentDescription="@string/next_host"
-				android:layout_marginTop="10dp"
-				android:layout_gravity="center_horizontal"/>
-
-			<TextView
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/next_host"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginBottom="5dp"
-				android:gravity="center_horizontal"/>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-</RelativeLayout>
+			android:text="@string/host_shortcuts_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/host_shortcuts_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/scroll_hints_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/scroll_hints_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/gesture_scrollback"
+			android:contentDescription="@string/scrolling_back"
+			android:layout_marginTop="10dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/scrolling_back"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:layout_marginBottom="5dp"
+			android:gravity="center_horizontal"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/gesture_scrollforward"
+			android:contentDescription="@string/scrolling_forward"
+			android:layout_marginTop="10dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/scrolling_forward"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:layout_marginBottom="5dp"
+			android:gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/page_updn_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/page_updn_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/gesture_pgup"
+			android:contentDescription="@string/page_up"
+			android:layout_marginTop="10dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/page_up"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:layout_marginBottom="5dp"
+			android:gravity="center_horizontal"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/gesture_pgdn"
+			android:contentDescription="@string/page_down"
+			android:layout_marginTop="10dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/page_down"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:layout_marginBottom="5dp"
+			android:gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/switching_hosts_header"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:layout_marginTop="10dp"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/switching_hosts_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/gesture_hostprev"
+			android:contentDescription="@string/prev_host"
+			android:layout_marginTop="10dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/prev_host"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:layout_marginBottom="5dp"
+			android:gravity="center_horizontal"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/gesture_hostnext"
+			android:contentDescription="@string/next_host"
+			android:layout_marginTop="10dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/next_host"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:layout_marginBottom="5dp"
+			android:gravity="center_horizontal"/>
+
+	</LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/dia_keyboard_shortcuts.xml b/app/src/main/res/layout/dia_keyboard_shortcuts.xml
index b6fb589..fca66b2 100644
--- a/app/src/main/res/layout/dia_keyboard_shortcuts.xml
+++ b/app/src/main/res/layout/dia_keyboard_shortcuts.xml
@@ -30,7 +30,7 @@
 			android:stretchColumns="1">
 			<TableRow>
 				<TextView
-					android:text="Ctrl-Shift-V"
+					android:text="@string/paste_shortcut"
 					android:padding="3dip"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					/>
@@ -45,7 +45,7 @@
 
 			<TableRow>
 				<TextView
-					android:text="Ctrl and +"
+					android:text="@string/increase_font_shortcut"
 					android:padding="3dip"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					/>
@@ -60,7 +60,7 @@
 
 			<TableRow>
 				<TextView
-					android:text="Ctrl and -"
+					android:text="@string/decrease_font_shortcut"
 					android:padding="3dip"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9482d9c..baf2db4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -103,8 +103,14 @@
 	<string name="keyboard_shortcuts">"Keyboard Shortcuts"</string>
 	<!-- Text in a keyboard shortcuts list lined up to keys which increase the terminal font-size. -->
 	<string name="increase_font_size">"Increase Font Size"</string>
+	<!-- Keyboard shortcut for increasing the font size. -->
+	<string name="increase_font_shortcut">Ctrl and +</string>
 	<!-- Text in a keyboard shortcuts list lined up to keys which decrease the terminal font-size. -->
 	<string name="decrease_font_size">"Decrease Font Size"</string>
+	<!-- Keyboard shortcut for decreasing the font size. -->
+	<string name="decrease_font_shortcut">Ctrl and -</string>
+	<!-- Keyboard shortcut for pasting into the terminal. -->
+	<string name="paste_shortcut">Ctrl-Shift-V</string>
 
 	<string name="pubkey_generate">"Generate"</string>
 	<string name="pubkey_import">"Import"</string>
-- 
cgit v1.2.3