From ae8b6d36493fc3629afe997a9700d001d6594b60 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Wed, 19 Aug 2015 23:48:11 -0700
Subject: Update XML style and reformat all files with it

---
 app/src/main/res/anim/fade_out_delayed.xml      |   6 +-
 app/src/main/res/anim/fade_stay_hidden.xml      |   4 +-
 app/src/main/res/anim/keyboard_fade_in.xml      |   6 +-
 app/src/main/res/anim/keyboard_fade_out.xml     |   6 +-
 app/src/main/res/anim/slide_left_in.xml         |   5 +-
 app/src/main/res/anim/slide_left_out.xml        |   5 +-
 app/src/main/res/anim/slide_right_in.xml        |   5 +-
 app/src/main/res/anim/slide_right_out.xml       |   5 +-
 app/src/main/res/color/blue.xml                 |   8 +-
 app/src/main/res/color/green.xml                |   8 +-
 app/src/main/res/color/red.xml                  |   8 +-
 app/src/main/res/drawable/connected.xml         |  10 +-
 app/src/main/res/drawable/pubkey.xml            |   6 +-
 app/src/main/res/layout-land/item_host.xml      |  41 +--
 app/src/main/res/layout-large/act_console.xml   | 424 ++++++++++++------------
 app/src/main/res/layout-port/item_host.xml      |  20 +-
 app/src/main/res/layout/act_colors.xml          |  26 +-
 app/src/main/res/layout/act_console.xml         |  56 ++--
 app/src/main/res/layout/act_eula.xml            | 104 +++---
 app/src/main/res/layout/act_generatepubkey.xml  | 119 +++----
 app/src/main/res/layout/act_help.xml            |  12 +-
 app/src/main/res/layout/act_help_topic.xml      |   2 +-
 app/src/main/res/layout/act_hostlist.xml        |  16 +-
 app/src/main/res/layout/act_portforwardlist.xml |  10 +-
 app/src/main/res/layout/act_pubkeylist.xml      |  10 +-
 app/src/main/res/layout/dia_changepassword.xml  |  31 +-
 app/src/main/res/layout/dia_gatherentropy.xml   |   8 +-
 app/src/main/res/layout/dia_password.xml        |   4 +-
 app/src/main/res/layout/dia_portforward.xml     |  35 +-
 app/src/main/res/layout/dia_resize.xml          |  10 +-
 app/src/main/res/layout/item_portforward.xml    |  16 +-
 app/src/main/res/layout/item_pubkey.xml         |  23 +-
 app/src/main/res/layout/item_terminal.xml       |   4 +-
 app/src/main/res/values/strings.xml             |   4 +-
 app/src/main/res/values/styles.xml              |   1 +
 35 files changed, 546 insertions(+), 512 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/anim/fade_out_delayed.xml b/app/src/main/res/anim/fade_out_delayed.xml
index 20ca839..5c40b70 100644
--- a/app/src/main/res/anim/fade_out_delayed.xml
+++ b/app/src/main/res/anim/fade_out_delayed.xml
@@ -19,9 +19,9 @@
 -->
 
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-	android:fromAlpha="1.0"
-	android:toAlpha="0.0"
 	android:duration="500"
-	android:startOffset="1000"
 	android:fillAfter="true"
+	android:fromAlpha="1.0"
+	android:startOffset="1000"
+	android:toAlpha="0.0"
 	/>
diff --git a/app/src/main/res/anim/fade_stay_hidden.xml b/app/src/main/res/anim/fade_stay_hidden.xml
index e62ca8b..30e00fa 100644
--- a/app/src/main/res/anim/fade_stay_hidden.xml
+++ b/app/src/main/res/anim/fade_stay_hidden.xml
@@ -19,8 +19,8 @@
 -->
 
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-	android:fromAlpha="0.0"
-	android:toAlpha="0.0"
 	android:duration="500"
 	android:fillAfter="true"
+	android:fromAlpha="0.0"
+	android:toAlpha="0.0"
 	/>
diff --git a/app/src/main/res/anim/keyboard_fade_in.xml b/app/src/main/res/anim/keyboard_fade_in.xml
index edd5b94..fa5351f 100644
--- a/app/src/main/res/anim/keyboard_fade_in.xml
+++ b/app/src/main/res/anim/keyboard_fade_in.xml
@@ -19,7 +19,7 @@
 -->
 
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-	android:interpolator="@android:anim/accelerate_interpolator"
+	android:duration="100"
 	android:fromAlpha="0.0"
-	android:toAlpha="1.0"
-	android:duration="100" />
+	android:interpolator="@android:anim/accelerate_interpolator"
+	android:toAlpha="1.0"/>
diff --git a/app/src/main/res/anim/keyboard_fade_out.xml b/app/src/main/res/anim/keyboard_fade_out.xml
index 1f37d32..fcc63e3 100644
--- a/app/src/main/res/anim/keyboard_fade_out.xml
+++ b/app/src/main/res/anim/keyboard_fade_out.xml
@@ -19,7 +19,7 @@
 -->
 
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-	android:interpolator="@android:anim/accelerate_interpolator"
+	android:duration="100"
 	android:fromAlpha="1.0"
-	android:toAlpha="0.0"
-	android:duration="100" />
+	android:interpolator="@android:anim/accelerate_interpolator"
+	android:toAlpha="0.0"/>
diff --git a/app/src/main/res/anim/slide_left_in.xml b/app/src/main/res/anim/slide_left_in.xml
index 29a0048..c60e917 100644
--- a/app/src/main/res/anim/slide_left_in.xml
+++ b/app/src/main/res/anim/slide_left_in.xml
@@ -19,6 +19,9 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="300"/>
+	<translate
+		android:duration="300"
+		android:fromXDelta="100%p"
+		android:toXDelta="0"/>
 	<!--  <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" />  -->
 </set>
diff --git a/app/src/main/res/anim/slide_left_out.xml b/app/src/main/res/anim/slide_left_out.xml
index 9c46442..bd7360d 100644
--- a/app/src/main/res/anim/slide_left_out.xml
+++ b/app/src/main/res/anim/slide_left_out.xml
@@ -19,6 +19,9 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="300"/>
+	<translate
+		android:duration="300"
+		android:fromXDelta="0"
+		android:toXDelta="-100%p"/>
 	<!--  <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" />  -->
 </set>
diff --git a/app/src/main/res/anim/slide_right_in.xml b/app/src/main/res/anim/slide_right_in.xml
index 0d52c9f..c69f371 100644
--- a/app/src/main/res/anim/slide_right_in.xml
+++ b/app/src/main/res/anim/slide_right_in.xml
@@ -19,6 +19,9 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="300"/>
+	<translate
+		android:duration="300"
+		android:fromXDelta="-100%p"
+		android:toXDelta="0"/>
 	<!--  <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" />  -->
 </set>
diff --git a/app/src/main/res/anim/slide_right_out.xml b/app/src/main/res/anim/slide_right_out.xml
index ace4e9d..2f7abbe 100644
--- a/app/src/main/res/anim/slide_right_out.xml
+++ b/app/src/main/res/anim/slide_right_out.xml
@@ -19,6 +19,9 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="300"/>
+	<translate
+		android:duration="300"
+		android:fromXDelta="0"
+		android:toXDelta="100%p"/>
 	<!--  <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" />  -->
 </set>
diff --git a/app/src/main/res/color/blue.xml b/app/src/main/res/color/blue.xml
index 981c3ef..7ff859c 100644
--- a/app/src/main/res/color/blue.xml
+++ b/app/src/main/res/color/blue.xml
@@ -19,8 +19,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:color="#000" />
-	<item android:state_focused="true" android:color="#000" />
-	<item android:state_pressed="true" android:color="#000" />
-	<item android:color="#88f" />
+	<item android:color="#000" android:state_selected="true"/>
+	<item android:color="#000" android:state_focused="true"/>
+	<item android:color="#000" android:state_pressed="true"/>
+	<item android:color="#88f"/>
 </selector>
diff --git a/app/src/main/res/color/green.xml b/app/src/main/res/color/green.xml
index 388ea58..acb166c 100644
--- a/app/src/main/res/color/green.xml
+++ b/app/src/main/res/color/green.xml
@@ -19,8 +19,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:color="#000" />
-	<item android:state_focused="true" android:color="#000" />
-	<item android:state_pressed="true" android:color="#000" />
-	<item android:color="#8f8" />
+	<item android:color="#000" android:state_selected="true"/>
+	<item android:color="#000" android:state_focused="true"/>
+	<item android:color="#000" android:state_pressed="true"/>
+	<item android:color="#8f8"/>
 </selector>
diff --git a/app/src/main/res/color/red.xml b/app/src/main/res/color/red.xml
index b7e18cd..440ee69 100644
--- a/app/src/main/res/color/red.xml
+++ b/app/src/main/res/color/red.xml
@@ -19,8 +19,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:color="#000" />
-	<item android:state_focused="true" android:color="#000" />
-	<item android:state_pressed="true" android:color="#000" />
-	<item android:color="#f00" />
+	<item android:color="#000" android:state_selected="true"/>
+	<item android:color="#000" android:state_focused="true"/>
+	<item android:color="#000" android:state_pressed="true"/>
+	<item android:color="#f00"/>
 </selector>
diff --git a/app/src/main/res/drawable/connected.xml b/app/src/main/res/drawable/connected.xml
index 7b633d3..7e15a8d 100644
--- a/app/src/main/res/drawable/connected.xml
+++ b/app/src/main/res/drawable/connected.xml
@@ -21,14 +21,14 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<item
-		android:state_checked="true"
-		android:drawable="@android:drawable/presence_online" />
+		android:drawable="@android:drawable/presence_online"
+		android:state_checked="true"/>
 
 	<item
-		android:state_expanded="true"
-		android:drawable="@android:drawable/presence_busy" />
+		android:drawable="@android:drawable/presence_busy"
+		android:state_expanded="true"/>
 
 	<item
-		android:drawable="@android:drawable/presence_invisible" />
+		android:drawable="@android:drawable/presence_invisible"/>
 
 </selector>
diff --git a/app/src/main/res/drawable/pubkey.xml b/app/src/main/res/drawable/pubkey.xml
index 1926d24..0dbdba9 100644
--- a/app/src/main/res/drawable/pubkey.xml
+++ b/app/src/main/res/drawable/pubkey.xml
@@ -21,10 +21,10 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<item
-		android:state_checked="true"
-		android:drawable="@drawable/pubkey_unlocked" />
+		android:drawable="@drawable/pubkey_unlocked"
+		android:state_checked="true"/>
 
 	<item
-		android:drawable="@drawable/pubkey_locked" />
+		android:drawable="@drawable/pubkey_locked"/>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml
index 9cde624..cbccd91 100644
--- a/app/src/main/res/layout-land/item_host.xml
+++ b/app/src/main/res/layout-land/item_host.xml
@@ -18,8 +18,9 @@
  */
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
 	android:id="@android:id/content"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:padding="10dip"
@@ -27,38 +28,38 @@
 
 	<ImageView
 		android:id="@android:id/icon"
-		android:src="@drawable/connected"
-		android:contentDescription="@string/image_description_connected"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
+		android:contentDescription="@string/image_description_connected"
 		android:paddingTop="5dip"
+		android:src="@drawable/connected"
 		/>
 
 	<LinearLayout
-		android:orientation="horizontal"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:orientation="horizontal"
 		>
 
-	<TextView
-		android:id="@android:id/text1"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:singleLine="true"
-		android:ellipsize="end"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		/>
+		<TextView
+			android:id="@android:id/text1"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			/>
+
+		<TextView
+			android:id="@android:id/text2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dip"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			/>
 
-	<TextView
-		android:id="@android:id/text2"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingLeft="10dip"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
 
-		
 	</LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index d735333..d27a05a 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -19,277 +19,277 @@
 -->
 
 <RelativeLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:app="http://schemas.android.com/apk/res-auto"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="#ff000000">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:background="#ff000000">
 
 	<android.support.v7.widget.Toolbar
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/toolbar"
-			android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
 
 	<android.support.design.widget.TabLayout
-			android:id="@+id/tabs"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			app:tabIndicatorColor="@android:color/white"
-			android:background="#222222"/>
+		android:id="@+id/tabs"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="#222222"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		app:tabIndicatorColor="@android:color/white"/>
 
 	<TextView
-			android:id="@android:id/empty"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:text="@string/terminal_no_hosts_connected"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:gravity="center"
-			android:layout_below="@id/toolbar"/>
+		android:id="@android:id/empty"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_below="@id/toolbar"
+		android:gravity="center"
+		android:text="@string/terminal_no_hosts_connected"
+		android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<android.support.v4.view.ViewPager
-			android:id="@+id/console_flip"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:layout_below="@id/toolbar"
-			/>
+		android:id="@+id/console_flip"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_below="@id/toolbar"
+		/>
 
 	<RelativeLayout
-			android:id="@+id/console_password_group"
+		android:id="@+id/console_password_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#80000000"
+		android:fadingEdge="horizontal"
+		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
+		android:visibility="gone"
+		>
+
+		<TextView
+			android:id="@+id/console_password_instructions"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:padding="5dip"
-			android:background="#80000000"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="25dip"
+			android:layout_marginBottom="5dip"
+			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:visibility="gone"
-			>
-
-		<TextView
-				android:id="@+id/console_password_instructions"
-				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:layout_width="fill_parent"
-				android:visibility="gone"
-				android:layout_marginBottom="5dip"
-				/>
+			/>
 
 		<EditText
-				android:id="@+id/console_password"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:password="true"
-				android:singleLine="true"
-				android:layout_below="@+id/console_password_instructions"
-				/>
+			android:id="@+id/console_password"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_password_instructions"
+			android:password="true"
+			android:singleLine="true"
+			/>
 
 	</RelativeLayout>
 
 	<RelativeLayout
-			android:id="@+id/console_boolean_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:padding="5dip"
-			android:background="#80000000"
-			android:fadingEdge="horizontal"
-			android:fadingEdgeLength="25dip"
-			android:visibility="gone"
-			>
+		android:id="@+id/console_boolean_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#80000000"
+		android:fadingEdge="horizontal"
+		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
+		android:visibility="gone"
+		>
 
 		<TextView
-				android:id="@+id/console_prompt"
-				android:layout_height="wrap_content"
-				android:layout_width="fill_parent"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				/>
+			android:id="@+id/console_prompt"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			/>
 
 		<Button
-				android:id="@+id/console_prompt_no"
-				android:text="@string/button_no"
-				android:paddingTop="5dip"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentEnd="true"
-				android:layout_alignParentRight="true"
-				android:layout_below="@+id/console_prompt"
-				android:clickable="false"
-				/>
+			android:id="@+id/console_prompt_no"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/console_prompt"
+			android:clickable="false"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_no"
+			/>
 
 		<Button
-				android:id="@+id/console_prompt_yes"
-				android:text="@string/button_yes"
-				android:paddingTop="5dip"
-				android:paddingBottom="10dip"
-				android:paddingLeft="40dip"
-				android:paddingRight="40dip"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toLeftOf="@+id/console_prompt_no"
-				android:layout_below="@+id/console_prompt"
-				/>
+			android:id="@+id/console_prompt_yes"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_prompt"
+			android:layout_toLeftOf="@+id/console_prompt_no"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_yes"
+			/>
 
 	</RelativeLayout>
 
 	<LinearLayout
-			android:id="@+id/keyboard_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:background="#55000000"
-			android:padding="0dip"
-			android:visibility="gone">
+		android:id="@+id/keyboard_group"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:background="#55000000"
+		android:padding="0dip"
+		android:visibility="gone">
 
 		<Button
-				android:id="@+id/button_ctrl"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_toggle_control_character"
-				android:padding="0dp"
-				android:text="@string/button_key_ctrl"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_ctrl"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_toggle_control_character"
+			android:padding="0dp"
+			android:text="@string/button_key_ctrl"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<Button
-				android:id="@+id/button_esc"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_send_escape_character"
-				android:padding="0dp"
-				android:text="@string/button_key_esc"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_esc"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_send_escape_character"
+			android:padding="0dp"
+			android:text="@string/button_key_esc"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<Button
-				android:id="@+id/button_tab"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_send_tab_character"
-				android:padding="0dp"
-				android:text="@string/button_key_tab"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_tab"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_send_tab_character"
+			android:padding="0dp"
+			android:text="@string/button_key_tab"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<Button
-				android:id="@+id/button_up"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_up"
-				android:padding="0dp"
-				android:text="@string/button_key_up"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_up"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_up"
+			android:padding="0dp"
+			android:text="@string/button_key_up"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<Button
-				android:id="@+id/button_down"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_down"
-				android:padding="0dp"
-				android:text="@string/button_key_down"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_down"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_down"
+			android:padding="0dp"
+			android:text="@string/button_key_down"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<Button
-				android:id="@+id/button_left"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_left"
-				android:padding="0dp"
-				android:text="@string/button_key_left"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_left"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_left"
+			android:padding="0dp"
+			android:text="@string/button_key_left"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<Button
-				android:id="@+id/button_right"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:background="#55f0f0f0"
-				android:contentDescription="@string/image_description_right"
-				android:padding="0dp"
-				android:text="@string/button_key_right"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_right"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_right"
+			android:padding="0dp"
+			android:text="@string/button_key_right"
+			android:textSize="10dip"
+			/>
 
 		<View
-				android:layout_width="1dp"
-				android:layout_height="match_parent"
-				android:background="#90000000"
-				/>
+			android:layout_width="1dp"
+			android:layout_height="match_parent"
+			android:background="#90000000"
+			/>
 
 		<ImageView
-				android:id="@+id/button_keyboard"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:layout_height="30dip"
-				android:layout_margin="0dp"
-				android:contentDescription="@string/image_description_show_keyboard"
-				android:padding="0dp"
-				android:src="@drawable/button_keyboard"
-				android:background="#55f0f0f0"
-				android:textSize="10dip"
-				/>
+			android:id="@+id/button_keyboard"
+			android:layout_width="0px"
+			android:layout_height="30dip"
+			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
+			android:contentDescription="@string/image_description_show_keyboard"
+			android:padding="0dp"
+			android:src="@drawable/button_keyboard"
+			android:textSize="10dip"
+			/>
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml
index 24d34ba..7ee7f0a 100644
--- a/app/src/main/res/layout-port/item_host.xml
+++ b/app/src/main/res/layout-port/item_host.xml
@@ -18,8 +18,8 @@
  */
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@android:id/content"
+<RelativeLayout android:id="@android:id/content"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:padding="10dip"
@@ -27,31 +27,31 @@
 
 	<ImageView
 		android:id="@android:id/icon"
-		android:src="@drawable/connected"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
-		android:paddingTop="5dip"
 		android:contentDescription="@string/image_description_connected"
+		android:paddingTop="5dip"
+		android:src="@drawable/connected"
 		/>
-		
+
 	<TextView
-		android:id="@android:id/text1"  
+		android:id="@android:id/text1"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:ellipsize="end"
 		android:paddingRight="20dip"
 		android:singleLine="true"
-		android:ellipsize="end"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		/>
 
 	<TextView
-		android:id="@android:id/text2"  
+		android:id="@android:id/text2"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
 		android:layout_below="@android:id/text1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
 		/>
-		
+
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_colors.xml b/app/src/main/res/layout/act_colors.xml
index 53f492c..5402bfb 100644
--- a/app/src/main/res/layout/act_colors.xml
+++ b/app/src/main/res/layout/act_colors.xml
@@ -24,49 +24,49 @@
 	android:layout_height="fill_parent">
 
 	<LinearLayout
-		android:orientation="horizontal"
+		android:id="@+id/spinners"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/spinners">
+		android:orientation="horizontal">
 
 		<Spinner
 			android:id="@+id/fg"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_alignParentStart="true"
 			android:layout_alignParentLeft="true"
-			android:minHeight="60dp"
+			android:layout_alignParentStart="true"
 			android:layout_weight="1"
 			android:gravity="center"
+			android:minHeight="60dp"
 			/>
 
 		<Spinner
 			android:id="@+id/bg"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_alignTop="@id/fg"
 			android:layout_alignParentEnd="true"
 			android:layout_alignParentRight="true"
+			android:layout_alignTop="@id/fg"
 			android:layout_toRightOf="@id/fg"
-			android:minHeight="60dp"
 			android:layout_weight="1"
 			android:gravity="center"
+			android:minHeight="60dp"
 			/>
 	</LinearLayout>
 
 	<GridView
 		android:id="@+id/color_grid"
-		android:layout_height="fill_parent"
 		android:layout_width="fill_parent"
-		android:padding="10dp"
-		android:verticalSpacing="10dp"
-		android:horizontalSpacing="10dp"
-		android:numColumns="auto_fit"
+		android:layout_height="fill_parent"
+		android:layout_below="@+id/spinners"
 		android:columnWidth="60dp"
-		android:stretchMode="columnWidth"
 		android:gravity="center"
+		android:horizontalSpacing="10dp"
 		android:minHeight="60dp"
-		android:layout_below="@+id/spinners"
+		android:numColumns="auto_fit"
+		android:padding="10dp"
+		android:stretchMode="columnWidth"
+		android:verticalSpacing="10dp"
 		/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index 5cdd7d1..8787265 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -29,9 +29,9 @@
 		android:id="@android:id/empty"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
+		android:gravity="center"
 		android:text="@string/terminal_no_hosts_connected"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center"/>
+		android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<android.support.v4.view.ViewPager
 		android:id="@+id/console_flip"
@@ -44,29 +44,29 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
-		android:padding="5dip"
 		android:background="#80000000"
 		android:fadingEdge="horizontal"
 		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
 		android:visibility="gone"
 		>
 
 		<TextView
 			android:id="@+id/console_password_instructions"
+			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginBottom="5dip"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:layout_width="fill_parent"
 			android:visibility="gone"
-			android:layout_marginBottom="5dip"
 			/>
 
 		<EditText
 			android:id="@+id/console_password"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
+			android:layout_below="@+id/console_password_instructions"
 			android:password="true"
 			android:singleLine="true"
-			android:layout_below="@+id/console_password_instructions"
 			/>
 
 	</RelativeLayout>
@@ -76,46 +76,46 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
-		android:padding="5dip"
 		android:background="#80000000"
 		android:fadingEdge="horizontal"
 		android:fadingEdgeLength="25dip"
+		android:padding="5dip"
 		android:visibility="gone"
 		>
 
 		<TextView
 			android:id="@+id/console_prompt"
-			android:layout_height="wrap_content"
 			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
 			/>
 
 		<Button
 			android:id="@+id/console_prompt_no"
-			android:text="@string/button_no"
-			android:paddingTop="5dip"
-			android:paddingBottom="10dip"
-			android:paddingLeft="40dip"
-			android:paddingRight="40dip"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentEnd="true"
 			android:layout_alignParentRight="true"
 			android:layout_below="@+id/console_prompt"
 			android:clickable="false"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_no"
 			/>
 
 		<Button
 			android:id="@+id/console_prompt_yes"
-			android:text="@string/button_yes"
-			android:paddingTop="5dip"
-			android:paddingBottom="10dip"
-			android:paddingLeft="40dip"
-			android:paddingRight="40dip"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_toLeftOf="@+id/console_prompt_no"
 			android:layout_below="@+id/console_prompt"
+			android:layout_toLeftOf="@+id/console_prompt_no"
+			android:paddingBottom="10dip"
+			android:paddingLeft="40dip"
+			android:paddingRight="40dip"
+			android:paddingTop="5dip"
+			android:text="@string/button_yes"
 			/>
 
 	</RelativeLayout>
@@ -132,9 +132,9 @@
 		<Button
 			android:id="@+id/button_ctrl"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_toggle_control_character"
 			android:padding="0dp"
@@ -151,9 +151,9 @@
 		<Button
 			android:id="@+id/button_esc"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_send_escape_character"
 			android:padding="0dp"
@@ -170,9 +170,9 @@
 		<Button
 			android:id="@+id/button_tab"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_send_tab_character"
 			android:padding="0dp"
@@ -189,9 +189,9 @@
 		<Button
 			android:id="@+id/button_up"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_up"
 			android:padding="0dp"
@@ -208,9 +208,9 @@
 		<Button
 			android:id="@+id/button_down"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_down"
 			android:padding="0dp"
@@ -227,9 +227,9 @@
 		<Button
 			android:id="@+id/button_left"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_left"
 			android:padding="0dp"
@@ -246,9 +246,9 @@
 		<Button
 			android:id="@+id/button_right"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
 			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_right"
 			android:padding="0dp"
@@ -265,13 +265,13 @@
 		<ImageView
 			android:id="@+id/button_keyboard"
 			android:layout_width="0px"
-			android:layout_weight="1"
 			android:layout_height="30dip"
 			android:layout_margin="0dp"
+			android:layout_weight="1"
+			android:background="#55f0f0f0"
 			android:contentDescription="@string/image_description_show_keyboard"
 			android:padding="0dp"
 			android:src="@drawable/button_keyboard"
-			android:background="#55f0f0f0"
 			android:textSize="10dip"
 			/>
 
diff --git a/app/src/main/res/layout/act_eula.xml b/app/src/main/res/layout/act_eula.xml
index de4ddc4..9f8eeea 100644
--- a/app/src/main/res/layout/act_eula.xml
+++ b/app/src/main/res/layout/act_eula.xml
@@ -16,74 +16,74 @@
   -->
 
 <RelativeLayout 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.EulaActivity">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:context="org.connectbot.EulaActivity">
 
 	<ScrollView
-			xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			>
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		>
 
 		<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="10dip"
-				>
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:padding="10dip"
+			>
 
 			<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device."
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					/>
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device."
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
 
 			<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:paddingTop="10dip"
-					android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps."
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					/>
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingTop="10dip"
+				android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps."
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
 
 			<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:paddingTop="10dip"
-					android:autoLink="web"
-					android:text="@string/copyright_info"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:paddingTop="10dip"
+				android:text="@string/copyright_info"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				/>
 
 			<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:paddingTop="10dip"
-					android:text="About and Credits"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					/>
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingTop="10dip"
+				android:text="About and Credits"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				/>
 
 			<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:paddingTop="10dip"
-					android:autoLink="web"
-					android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com"
-					android:textSize="14sp"
-					android:textColor="#bebebe"
-					/>
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:paddingTop="10dip"
+				android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com"
+				android:textColor="#bebebe"
+				android:textSize="14sp"
+				/>
 
 			<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:paddingTop="10dip"
-					android:text="@string/msg_version"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					/>
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingTop="10dip"
+				android:text="@string/msg_version"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				/>
 
 		</LinearLayout>
 
diff --git a/app/src/main/res/layout/act_generatepubkey.xml b/app/src/main/res/layout/act_generatepubkey.xml
index f10b80b..feb0ed9 100644
--- a/app/src/main/res/layout/act_generatepubkey.xml
+++ b/app/src/main/res/layout/act_generatepubkey.xml
@@ -20,166 +20,171 @@
 
 <ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:scrollbars="vertical"
-	android:layout_width="fill_parent">
+	android:scrollbars="vertical">
 
 	<TableLayout
-		android:orientation="vertical"
+		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:orientation="vertical"
 		android:paddingLeft="10dip"
 		android:paddingRight="10dip"
-		android:scrollbars="vertical"
-		android:layout_width="fill_parent">
+		android:scrollbars="vertical">
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_nickname"
-				android:paddingRight="10dip"
 				android:gravity="end|center_vertical"
-				android:textAppearance="?android:attr/textAppearanceMedium" />
+				android:paddingRight="10dip"
+				android:text="@string/prompt_nickname"
+				android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 			<EditText
 				android:id="@+id/nickname"
-				android:hint="@string/prompt_nickname_hint_pubkey"
 				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_weight="1" />
+				android:layout_weight="1"
+				android:hint="@string/prompt_nickname_hint_pubkey"
+				android:singleLine="true"/>
 		</TableRow>
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_type"
-				android:paddingRight="10dip"
-				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:layout_gravity="center_vertical"
 				android:gravity="bottom|end"
-				android:layout_gravity="center_vertical" />
+				android:paddingRight="10dip"
+				android:text="@string/prompt_type"
+				android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 			<RadioGroup
 				android:id="@+id/key_type"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:checkedButton="@+id/rsa">
+				android:checkedButton="@+id/rsa"
+				android:orientation="horizontal">
 
 				<RadioButton
 					android:id="@+id/rsa"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="RSA"
-					android:paddingRight="3dip"/>
+					android:paddingRight="3dip"
+					android:text="RSA"/>
 
 				<RadioButton
 					android:id="@+id/dsa"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="DSA"
-					android:paddingRight="3dip"/>
+					android:paddingRight="3dip"
+					android:text="DSA"/>
 
 				<RadioButton
 					android:id="@+id/ec"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="EC" />
+					android:text="EC"/>
 			</RadioGroup>
 		</TableRow>
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_bits"
+				android:gravity="end|center_vertical"
 				android:paddingRight="10dip"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:gravity="end|center_vertical" />
+				android:text="@string/prompt_bits"
+				android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 			<EditText
 				android:id="@+id/bits"
-				android:inputType="number"
 				android:layout_height="wrap_content"
-				android:text="1024"
+				android:layout_weight="1"
+				android:inputType="number"
 				android:singleLine="true"
-				android:layout_weight="1" />
+				android:text="1024"/>
 		</TableRow>
 
 		<SeekBar
-			android:layout_height="wrap_content"
 			android:id="@+id/bits_slider"
 			android:layout_width="fill_parent"
-			android:paddingBottom="10dip"
+			android:layout_height="wrap_content"
 			android:max="3328"
-			android:progress="256" />
+			android:paddingBottom="10dip"
+			android:progress="256"/>
 
 		<TextView
-			android:text="@string/prompt_password_can_be_blank"
-			android:gravity="start"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_width="wrap_content" />
+			android:gravity="start"
+			android:text="@string/prompt_password_can_be_blank"/>
 
 		<TableRow>
+
 			<TextView
-				android:paddingRight="10dip"
-				android:gravity="end|center_vertical"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:text="@string/prompt_password" />
+				android:gravity="end|center_vertical"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_password"
+				android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 			<EditText
 				android:id="@+id/password1"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_weight="1"
 				android:password="true"
-				android:singleLine="true"
-				android:layout_weight="1" />
+				android:singleLine="true"/>
 		</TableRow>
 
 		<TableRow android:paddingBottom="6dip">
+
 			<LinearLayout
-				android:paddingRight="10dip"
+				android:gravity="end|center_vertical"
 				android:orientation="vertical"
-				android:gravity="end|center_vertical">
+				android:paddingRight="10dip">
 
 				<TextView
-					android:gravity="end|bottom"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/prompt_password" />
+					android:gravity="end|bottom"
+					android:text="@string/prompt_password"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 				<TextView
-					android:gravity="end|top"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:text="@string/prompt_again" />
+					android:gravity="end|top"
+					android:text="@string/prompt_again"
+					android:textAppearance="?android:attr/textAppearanceSmall"/>
 			</LinearLayout>
 
 			<EditText
 				android:id="@+id/password2"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_weight="1"
 				android:password="true"
-				android:singleLine="true"
-				android:layout_weight="1" />
+				android:singleLine="true"/>
 		</TableRow>
 
 		<CheckBox
+			android:id="@+id/unlock_at_startup"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:id="@+id/unlock_at_startup"
-			android:text="@string/pubkey_load_on_start" />
+			android:text="@string/pubkey_load_on_start"/>
 
 		<CheckBox
+			android:id="@+id/confirm_use"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:id="@+id/confirm_use"
-			android:text="@string/pubkey_confirm_use" />
+			android:text="@string/pubkey_confirm_use"/>
 
 		<Button
+			android:id="@+id/save"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:id="@+id/save"
-			android:text="@string/pubkey_generate"
+			android:layout_marginTop="6dip"
 			android:enabled="false"
-			android:layout_marginTop="6dip"/>
+			android:text="@string/pubkey_generate"/>
 	</TableLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/act_help.xml b/app/src/main/res/layout/act_help.xml
index adf17f3..b4bb808 100644
--- a/app/src/main/res/layout/act_help.xml
+++ b/app/src/main/res/layout/act_help.xml
@@ -27,29 +27,29 @@
 
 	<LinearLayout
 		android:id="@+id/topics"
-		android:orientation="vertical"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:gravity="center_horizontal"
+		android:orientation="vertical"
 		>
 
 		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/msg_version"
-			android:paddingTop="2dip"
-			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:gravity="end"
 			android:paddingRight="2dip"
+			android:paddingTop="2dip"
+			android:text="@string/msg_version"
+			android:textAppearance="?android:attr/textAppearanceSmall"
 			/>
 
 		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/help_intro"
+			android:gravity="center_horizontal"
 			android:paddingTop="2dip"
+			android:text="@string/help_intro"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:gravity="center_horizontal"
 			/>
 
 	</LinearLayout>
diff --git a/app/src/main/res/layout/act_help_topic.xml b/app/src/main/res/layout/act_help_topic.xml
index 7123d63..f02e35e 100644
--- a/app/src/main/res/layout/act_help_topic.xml
+++ b/app/src/main/res/layout/act_help_topic.xml
@@ -19,9 +19,9 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:orientation="vertical"
 	>
 
 	<org.connectbot.util.HelpTopicView
diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml
index a0214d4..647563c 100644
--- a/app/src/main/res/layout/act_hostlist.xml
+++ b/app/src/main/res/layout/act_hostlist.xml
@@ -20,36 +20,36 @@
 
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:orientation="vertical"
 	>
 
 	<LinearLayout
 		android:id="@+id/quickconnect"
-                android:orientation="horizontal"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
-		android:layout_alignParentStart="true"
 		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:orientation="horizontal"
 		>
 
 		<Spinner
 			android:id="@+id/transport_selection"
-			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
 			/>
 
 		<EditText
 			android:id="@+id/front_quickconnect"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:focusableInTouchMode="true"
 			android:hint="username@hostname:port"
 			android:inputType="textEmailAddress"
 			android:maxLines="1"
-			android:ellipsize="end"
-			android:focusableInTouchMode="true"
 			android:singleLine="true"/>
 	</LinearLayout>
 
@@ -65,10 +65,10 @@
 		android:id="@android:id/empty"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
+		android:layout_above="@+id/quickconnect"
+		android:gravity="center"
 		android:text="@string/list_host_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center"
-		android:layout_above="@+id/quickconnect"
 		/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/act_portforwardlist.xml b/app/src/main/res/layout/act_portforwardlist.xml
index b8589d0..46393ae 100644
--- a/app/src/main/res/layout/act_portforwardlist.xml
+++ b/app/src/main/res/layout/act_portforwardlist.xml
@@ -19,22 +19,24 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:orientation="vertical"
 	>
 
-	<ListView android:id="@android:id/list"
+	<ListView
+		android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"
 		/>
 
-	<TextView android:id="@android:id/empty"
+	<TextView
+		android:id="@android:id/empty"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
+		android:gravity="center"
 		android:text="@string/portforward_list_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center"
 		/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/act_pubkeylist.xml b/app/src/main/res/layout/act_pubkeylist.xml
index ceabb52..0737d05 100644
--- a/app/src/main/res/layout/act_pubkeylist.xml
+++ b/app/src/main/res/layout/act_pubkeylist.xml
@@ -19,22 +19,24 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:orientation="vertical"
 	>
 
-	<ListView android:id="@android:id/list"
+	<ListView
+		android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"
 		/>
 
-	<TextView android:id="@android:id/empty"
+	<TextView
+		android:id="@android:id/empty"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
+		android:gravity="center"
 		android:text="@string/pubkey_list_empty"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center"
 		/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dia_changepassword.xml b/app/src/main/res/layout/dia_changepassword.xml
index fe5f1dc..7f0d5b2 100644
--- a/app/src/main/res/layout/dia_changepassword.xml
+++ b/app/src/main/res/layout/dia_changepassword.xml
@@ -26,64 +26,67 @@
 	>
 
 	<TableRow android:id="@+id/old_password_prompt">
+
 		<TextView
-			android:text="@string/prompt_old_password"
-			android:paddingRight="10dip"
+			android:layout_width="wrap_content"
 			android:gravity="end|center_vertical"
+			android:paddingRight="10dip"
+			android:text="@string/prompt_old_password"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:layout_width="wrap_content"
 			/>
 
 		<EditText
 			android:id="@+id/old_password"
 			android:layout_width="200dip"
 			android:layout_height="wrap_content"
-			android:singleLine="true"
 			android:password="true"
+			android:singleLine="true"
 			/>
 	</TableRow>
 
 	<TableRow>
+
 		<TextView
-			android:text="@string/prompt_password"
-			android:paddingRight="10dip"
+			android:layout_width="wrap_content"
 			android:gravity="end|center_vertical"
+			android:paddingRight="10dip"
+			android:text="@string/prompt_password"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:layout_width="wrap_content"
 			/>
 
 		<EditText
 			android:id="@+id/password1"
 			android:layout_width="200dip"
 			android:layout_height="wrap_content"
-			android:singleLine="true"
 			android:password="true"
+			android:singleLine="true"
 			/>
 	</TableRow>
 
 	<TableRow>
+
 		<LinearLayout
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"
 			android:gravity="end"
+			android:orientation="vertical"
 			>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/prompt_password"
-				android:paddingRight="10dip"
 				android:gravity="end|bottom"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_password"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/prompt_again"
-				android:paddingRight="10dip"
 				android:gravity="end|top"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_again"
 				android:textAppearance="?android:attr/textAppearanceSmall"
 				/>
 		</LinearLayout>
@@ -92,8 +95,8 @@
 			android:id="@+id/password2"
 			android:layout_width="200dip"
 			android:layout_height="wrap_content"
-			android:singleLine="true"
 			android:password="true"
+			android:singleLine="true"
 			/>
 	</TableRow>
 </TableLayout>
diff --git a/app/src/main/res/layout/dia_gatherentropy.xml b/app/src/main/res/layout/dia_gatherentropy.xml
index 8c7153a..2fc4a60 100644
--- a/app/src/main/res/layout/dia_gatherentropy.xml
+++ b/app/src/main/res/layout/dia_gatherentropy.xml
@@ -19,9 +19,9 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
+	android:orientation="vertical"
 	android:paddingLeft="10dip"
 	android:paddingRight="10dip"
 	>
@@ -29,16 +29,16 @@
 	<TextView
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:gravity="center"
 		android:text="@string/pubkey_touch_hint"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="center"/>
+		android:textAppearance="?android:attr/textAppearanceMedium"/>
 
 	<org.connectbot.util.EntropyView
 		android:id="@+id/entropy"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:background="#666666ff"
 		android:layout_marginBottom="10dip"
 		android:layout_marginTop="10dip"
+		android:background="#666666ff"
 		android:drawingCacheQuality="auto"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dia_password.xml b/app/src/main/res/layout/dia_password.xml
index 599af83..148e197 100644
--- a/app/src/main/res/layout/dia_password.xml
+++ b/app/src/main/res/layout/dia_password.xml
@@ -28,10 +28,10 @@
 	<EditText
 		android:id="@android:id/text1"
 		android:layout_width="250dip"
-		android:singleLine="true"
 		android:layout_height="wrap_content"
+		android:hint="@string/prompt_password"
 		android:password="true"
-		android:hint="Password"
+		android:singleLine="true"
 		/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dia_portforward.xml b/app/src/main/res/layout/dia_portforward.xml
index ed6aa40..f2ef3ed 100644
--- a/app/src/main/res/layout/dia_portforward.xml
+++ b/app/src/main/res/layout/dia_portforward.xml
@@ -19,8 +19,8 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="fill_parent"
 	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
 	android:scrollbars="vertical"
 	>
 
@@ -32,72 +32,77 @@
 		>
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_nickname"
-				android:paddingRight="10dip"
 				android:gravity="end|center_vertical"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_nickname"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
 
 			<EditText
 				android:id="@+id/nickname"
-				android:hint="Internal Webserver"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
-				android:singleLine="true"
 				android:layout_weight="1"
+				android:hint="Internal Webserver"
+				android:singleLine="true"
 				/>
 		</TableRow>
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_type"
-				android:paddingRight="10dip"
 				android:gravity="end|center_vertical"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_type"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
 
-			<Spinner android:id="@+id/portforward_type"
+			<Spinner
+				android:id="@+id/portforward_type"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
+				android:layout_weight="1"
 				android:entries="@array/list_portforward_types"
 				android:prompt="@string/prompt_type"
-				android:layout_weight="1"
 				/>
 		</TableRow>
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_source_port"
-				android:paddingRight="10dip"
 				android:gravity="end|center_vertical"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_source_port"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
 
 			<EditText
 				android:id="@+id/portforward_source"
-				android:hint="8080"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
+				android:hint="8080"
 				android:inputType="number"
 				/>
 		</TableRow>
 
 		<TableRow>
+
 			<TextView
-				android:text="@string/prompt_destination"
-				android:paddingRight="10dip"
 				android:gravity="end|center_vertical"
+				android:paddingRight="10dip"
+				android:text="@string/prompt_destination"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				/>
 
 			<EditText
 				android:id="@+id/portforward_destination"
-				android:hint="localhost:80"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
+				android:hint="localhost:80"
 				android:inputType="textEmailAddress"
 				/>
 		</TableRow>
diff --git a/app/src/main/res/layout/dia_resize.xml b/app/src/main/res/layout/dia_resize.xml
index 781243d..e31d58e 100644
--- a/app/src/main/res/layout/dia_resize.xml
+++ b/app/src/main/res/layout/dia_resize.xml
@@ -19,9 +19,9 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
+	android:orientation="horizontal"
 	android:paddingLeft="10dip"
 	android:paddingRight="10dip"
 	>
@@ -30,17 +30,17 @@
 		android:id="@+id/width"
 		android:layout_width="100dip"
 		android:layout_height="wrap_content"
-		android:singleLine="true"
 		android:numeric="integer"
+		android:singleLine="true"
 		android:text="80"/>
 
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="x"
+		android:gravity="end|bottom"
 		android:paddingLeft="10dip"
 		android:paddingRight="10dip"
-		android:gravity="end|bottom"
+		android:text="x"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		/>
 
@@ -49,7 +49,7 @@
 		android:id="@+id/height"
 		android:layout_width="100dip"
 		android:layout_height="wrap_content"
-		android:singleLine="true"
 		android:numeric="integer"
+		android:singleLine="true"
 		android:text="25"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_portforward.xml b/app/src/main/res/layout/item_portforward.xml
index 105ef58..f2214a7 100644
--- a/app/src/main/res/layout/item_portforward.xml
+++ b/app/src/main/res/layout/item_portforward.xml
@@ -19,10 +19,10 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:orientation="vertical"
 	android:gravity="start|center_vertical"
-	android:layout_width="fill_parent"
+	android:orientation="vertical"
 	android:padding="10dip"
 	>
 
@@ -30,20 +30,20 @@
 		android:id="@android:id/text1"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:text="Tunnel Nickname"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentStart="true"
 		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentTop="true"
+		android:text="Tunnel Nickname"
+		android:textAppearance="?android:attr/textAppearanceLarge"
 		/>
 
 	<TextView
 		android:id="@android:id/text2"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		android:text="Local port 8080 to 192.168.1.1:80"
 		android:layout_below="@android:id/text1"
+		android:text="Local port 8080 to 192.168.1.1:80"
+		android:textAppearance="?android:attr/textAppearanceSmall"
 		/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_pubkey.xml b/app/src/main/res/layout/item_pubkey.xml
index 34a7330..ed0c7d2 100644
--- a/app/src/main/res/layout/item_pubkey.xml
+++ b/app/src/main/res/layout/item_pubkey.xml
@@ -18,8 +18,9 @@
  */
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
 	android:id="@android:id/content"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:padding="10dip">
@@ -28,29 +29,31 @@
 		android:id="@android:id/icon1"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:src="@drawable/pubkey"
-		android:contentDescription="@string/image_description_key_is_locked"
 		android:layout_alignParentEnd="true"
 		android:layout_alignParentRight="true"
 		android:layout_alignParentTop="true"
-		android:layout_marginLeft="10dip"/>
+		android:layout_marginLeft="10dip"
+		android:contentDescription="@string/image_description_key_is_locked"
+		android:src="@drawable/pubkey"/>
 
 	<TextView
 		android:id="@android:id/text1"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:text="Key Example"
-		android:layout_alignParentStart="true"
 		android:layout_alignParentLeft="true"
-		android:bufferType="normal" android:layout_width="wrap_content" android:layout_toLeftOf="@android:id/icon1"/>
+		android:layout_alignParentStart="true"
+		android:layout_toLeftOf="@android:id/icon1"
+		android:bufferType="normal"
+		android:text="Key Example"
+		android:textAppearance="?android:attr/textAppearanceLarge"/>
 
 	<TextView
 		android:id="@android:id/text2"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		android:text="DSA 1024-bit"
 		android:layout_below="@android:id/text1"
+		android:text="DSA 1024-bit"
+		android:textAppearance="?android:attr/textAppearanceSmall"
 		/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_terminal.xml b/app/src/main/res/layout/item_terminal.xml
index 9a8ff19..b34c800 100644
--- a/app/src/main/res/layout/item_terminal.xml
+++ b/app/src/main/res/layout/item_terminal.xml
@@ -28,10 +28,10 @@
 		android:id="@+id/terminal_overlay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_centerInParent="true"
 		android:background="#aa000000"
 		android:padding="10dip"
-		android:layout_centerInParent="true"
+		android:textAppearance="?android:attr/textAppearanceLarge"
 		/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c2ce2e7..7c4c591 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,8 +18,8 @@
  */
 -->
 
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"
-           xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools"
+	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 	<!-- Summary of what ConnectBot is; used as a short description in the Android running apps list -->
 	<string name="app_desc">"Simple, powerful, open-source SSH client."</string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f0cd073..d6496eb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,6 +18,7 @@
  */
 -->
 <resources>
+
 	<style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowContentOverlay">@null</item>
-- 
cgit v1.2.3