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/res/layout-sw500dp/act_hints.xml | 403 +++++++++++++-------------
 1 file changed, 201 insertions(+), 202 deletions(-)

(limited to 'app/src/main/res/layout-sw500dp')

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>
-- 
cgit v1.2.3