From 8ba585978a5e4757a2885901b0a43b7908c2b508 Mon Sep 17 00:00:00 2001
From: Jeffrey Sharkey <jsharkey@jsharkey.org>
Date: Fri, 24 Oct 2008 21:08:57 +0000
Subject: * removed older res files

---
 res/layout-land/item_host.xml  | 17 ++++++++
 res/layout-port/item_host.xml  | 17 ++++++++
 res/layout/about_dialog.xml    | 22 ----------
 res/layout/act_about.xml       | 37 ----------------
 res/layout/act_console.xml     | 48 ++++++++-------------
 res/layout/act_frontpage.xml   | 29 -------------
 res/layout/act_hosteditor.xml  | 98 ------------------------------------------
 res/layout/act_hostlist.xml    | 20 ++++++++-
 res/layout/act_wizard.xml      | 92 +++++++++++++++++++++++----------------
 res/layout/host_editor.xml     | 53 -----------------------
 res/layout/item_host.xml       | 57 ------------------------
 res/layout/item_terminal.xml   | 33 ++++++++++----
 res/layout/main.xml            | 13 ------
 res/layout/message_dialog.xml  | 17 --------
 res/layout/password_dialog.xml | 26 -----------
 res/layout/pubkey.xml          | 33 --------------
 res/layout/secure_shell.xml    | 18 --------
 res/layout/wiz_eula.xml        | 17 ++++++++
 res/layout/wiz_features.xml    | 17 ++++++++
 res/xml/host_prefs.xml         | 18 ++++++++
 res/xml/preferences.xml        | 18 ++++++++
 21 files changed, 222 insertions(+), 478 deletions(-)
 delete mode 100644 res/layout/about_dialog.xml
 delete mode 100644 res/layout/act_about.xml
 delete mode 100644 res/layout/act_frontpage.xml
 delete mode 100644 res/layout/act_hosteditor.xml
 delete mode 100644 res/layout/host_editor.xml
 delete mode 100644 res/layout/item_host.xml
 delete mode 100644 res/layout/main.xml
 delete mode 100644 res/layout/message_dialog.xml
 delete mode 100644 res/layout/password_dialog.xml
 delete mode 100644 res/layout/pubkey.xml
 delete mode 100644 res/layout/secure_shell.xml

diff --git a/res/layout-land/item_host.xml b/res/layout-land/item_host.xml
index 426b18c..a267cc0 100644
--- a/res/layout-land/item_host.xml
+++ b/res/layout-land/item_host.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@android:id/content"  
 	android:layout_width="fill_parent"
diff --git a/res/layout-port/item_host.xml b/res/layout-port/item_host.xml
index e5db460..c1c7392 100644
--- a/res/layout-port/item_host.xml
+++ b/res/layout-port/item_host.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@android:id/content"  
 	android:layout_width="fill_parent"
diff --git a/res/layout/about_dialog.xml b/res/layout/about_dialog.xml
deleted file mode 100644
index 9ef62bc..0000000
--- a/res/layout/about_dialog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				android:orientation="horizontal"
-                android:layout_width="fill_parent" 
-                android:layout_height="64px"
-                android:theme="@android:style/Theme.Dialog">
-
-	<ImageView android:id="@+id/icon"
-				android:layout_width="75px"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"
-				android:minHeight="64px"
-				android:minWidth="64px"
-				android:src="@drawable/icon"/>
-	
-    <TextView android:id="@+id/copyright" 
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content" 
-				android:paddingLeft="10dip"
-                android:layout_weight="2"
-                android:text="@string/msg_copyright"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/act_about.xml b/res/layout/act_about.xml
deleted file mode 100644
index ad71137..0000000
--- a/res/layout/act_about.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	>
-
-<LinearLayout
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:gravity="center"
-	>
-	
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:padding="5dip"
-		android:text="ConnectBot"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		/>
-
-	<TextView
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:padding="5dip"
-		android:text="Copyright (c) 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/\nReleased under the GPLv3 license.\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright (c) 2007 Trilead AG.  http://www.trilead.com/\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright (c) Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org/"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
-
-
-		 
-
-
-</LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/act_console.xml b/res/layout/act_console.xml
index 9fb738c..3f0f66b 100644
--- a/res/layout/act_console.xml
+++ b/res/layout/act_console.xml
@@ -1,34 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/console_flip"  
 	android:layout_width="fill_parent"  
 	android:layout_height="fill_parent"  
-	>
-	
-	<!-- 
-	<TextView
-		android:background="#ff880000"
-		android:text="1"
-		android:textSize="50pt"
-		android:layout_width="fill_parent"  
-		android:layout_height="fill_parent"  
-		/>
-         
-	<TextView
-		android:background="#ff008800"
-		android:text="2"
-		android:textSize="50pt"
-		android:layout_width="fill_parent"  
-		android:layout_height="fill_parent"  
-		/>
-
-	<TextView
-		android:background="#ff000088"
-		android:text="3"
-		android:textSize="50pt"
-		android:layout_width="fill_parent"  
-		android:layout_height="fill_parent"  
-		/>
-		 -->
-
-</ViewFlipper>  
\ No newline at end of file
+	/>
diff --git a/res/layout/act_frontpage.xml b/res/layout/act_frontpage.xml
deleted file mode 100644
index 299de53..0000000
--- a/res/layout/act_frontpage.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	>
-	
-	<ListView android:id="@+id/front_hostlist"
-		android:layout_width="fill_parent"
-		android:layout_height="0dip"
-		android:layout_weight="1"
-		/>
-
-
-	<FrameLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:padding="5dip"  
-		>
-
-	    <EditText android:id="@+id/front_quickconnect"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:hint="user@hostname"
-			/>
-	
-	</FrameLayout>
-	
-</LinearLayout>
diff --git a/res/layout/act_hosteditor.xml b/res/layout/act_hosteditor.xml
deleted file mode 100644
index 2f18eee..0000000
--- a/res/layout/act_hosteditor.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	>
-
-<LinearLayout
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	>
-
-<TableLayout 
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	>
-	
-	<TableRow>
-		<TextView android:text="Nickname:" android:textSize="18dip" android:layout_width="140dip" android:paddingRight="10dip" android:gravity="right" />
-		<EditText android:id="@+id/edit_nickname" android:text="user@hostname" android:layout_width="320dip" />
-	</TableRow>
-	
-	<TableRow>
-		<TextView android:text="Username:" android:textSize="18dip" android:paddingRight="10dip" android:gravity="right" />
-		<EditText android:id="@+id/edit_username" android:layout_width="240dip" android:layout_height="wrap_content" android:text="root" />
-	</TableRow>
-	
-	<TableRow>
-		<TextView android:text="Host:" android:textSize="18dip" android:paddingRight="10dip" android:gravity="right" />
-		<EditText android:id="@+id/edit_hostname" android:text="bigserver.example.com" />
-	</TableRow>
-	
-</TableLayout>
-
-<TableLayout 
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	>
-
-	<TableRow>
-		<TextView android:text="Port:" android:textSize="18dip" android:layout_width="140dip" android:paddingRight="10dip" android:gravity="right" />
-		<EditText android:id="@+id/edit_port" android:layout_width="120dip" android:layout_height="wrap_content" android:text="22" />
-	</TableRow>
-
-</TableLayout>
-
-<TableLayout 
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	>
-
-
-<!-- 
-	<TableRow>
-		<TextView android:text="Password:" android:textSize="18dip" android:paddingRight="10dip" android:gravity="right" />
-		<EditText android:text="youfail" android:password="true" />
-	</TableRow>
-
-	<TableRow>
-		<FrameLayout />
-		<TextView android:text="All passwords are encrypted with your\nphone's IMEI before storage"
-			android:paddingBottom="10dip"
-			android:paddingLeft="20dip"
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</TableRow>
- -->
- 
-  
-	<TableRow>
-		<TextView android:text="Emulation:" android:layout_width="140dip" android:textSize="18dip" android:paddingRight="10dip" android:gravity="right" />
-		<Spinner android:id="@+id/edit_emulation" android:entries="@array/list_emulation_modes" />
-	</TableRow>
-
-	<TableRow>
-		<FrameLayout />
-		<TextView android:text="Terminal emulation mode to request\nfor any console sessions"
-			android:paddingBottom="10dip"
-			android:paddingLeft="20dip"
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</TableRow>
-
-	<TableRow>
-		<TextView android:text="Scrollback:" android:textSize="18dip" android:paddingRight="10dip" android:gravity="right" />
-		<EditText android:id="@+id/edit_scrollback" android:text="140" />
-	</TableRow>
-
-	<TableRow>
-		<FrameLayout />
-		<TextView android:text="Length of scrollback buffer in rows to\nallocate in local phone memory"
-			android:paddingBottom="10dip"
-			android:paddingLeft="20dip"
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</TableRow>
-
-</TableLayout>
-
-</LinearLayout>
-
-</ScrollView>
diff --git a/res/layout/act_hostlist.xml b/res/layout/act_hostlist.xml
index 89d6e4f..36d2235 100644
--- a/res/layout/act_hostlist.xml
+++ b/res/layout/act_hostlist.xml
@@ -1,11 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	>
 	
-	<ListView android:id="@+id/front_hostlist"
+	<ListView android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="0dip"
 		android:layout_weight="1"
diff --git a/res/layout/act_wizard.xml b/res/layout/act_wizard.xml
index eabf628..3b97103 100644
--- a/res/layout/act_wizard.xml
+++ b/res/layout/act_wizard.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="fill_parent"
@@ -6,47 +24,47 @@
 	android:gravity="right"
 	>
 
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:id="@+id/wizard_scroll"
-	>
+	<ScrollView
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:id="@+id/wizard_scroll"
+		>
+		
+		<ViewFlipper
+			android:id="@+id/wizard_flipper"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			/>
+		
+	</ScrollView>
 	
-	<ViewFlipper
-		android:id="@+id/wizard_flipper"
+	<LinearLayout
+		android:orientation="horizontal"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		/>
+		android:padding="10dip"
+		>
+		
+		<Button
+			android:id="@+id/action_prev"
+			android:layout_width="120dip"
+			android:layout_height="wrap_content"
+			android:drawableLeft="@drawable/ic_btn_back"
+			android:text="Cancel"
+			android:gravity="center"
+			/>
 	
-</ScrollView>
-
-<LinearLayout
-	android:orientation="horizontal"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:padding="10dip"
-	>
+		<Button
+			android:id="@+id/action_next"
+			android:layout_width="120dip"
+			android:layout_height="wrap_content"
+			android:drawableRight="@drawable/ic_btn_next"
+			android:text="Agree"
+			android:gravity="center"
+			/>
 	
-	<Button
-		android:id="@+id/action_prev"
-		android:layout_width="120dip"
-		android:layout_height="wrap_content"
-		android:drawableLeft="@drawable/ic_btn_back"
-		android:text="Cancel"
-		android:gravity="center"
-		/>
-
-	<Button
-		android:id="@+id/action_next"
-		android:layout_width="120dip"
-		android:layout_height="wrap_content"
-		android:drawableRight="@drawable/ic_btn_next"
-		android:text="Agree"
-		android:gravity="center"
-		/>
-
-</LinearLayout>
+	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/host_editor.xml b/res/layout/host_editor.xml
deleted file mode 100644
index ced7653..0000000
--- a/res/layout/host_editor.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/usernameLabel" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="Username:"/>
-
-    <EditText android:id="@+id/username" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:layout_below="@id/usernameLabel"/>
-
-    <TextView android:id="@+id/hostnameLabel" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content"
-              android:layout_below="@id/username" 
-              android:text="Hostname:"/>
-
-    <EditText android:id="@+id/hostname" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:layout_below="@id/hostnameLabel"/>
-                
-	<TextView android:id="@+id/portLabel" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content"
-              android:layout_below="@id/hostname" 
-              android:text="Port:"/>
-
-    <EditText android:id="@+id/port" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="22"
-              android:layout_below="@id/portLabel"/>
- 
-    <Button android:id="@+id/add" 
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content" 
-            android:layout_below="@id/port"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="10dip"
-            android:text="@string/button_add" />
-
-    <Button android:id="@+id/cancel"
-    		android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/add"
-            android:layout_alignTop="@id/add"
-            android:text="@string/button_cancel" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_host.xml b/res/layout/item_host.xml
deleted file mode 100644
index b11dc05..0000000
--- a/res/layout/item_host.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:padding="10dip"  
-	>
-
-	<ImageView
-		android:id="@+id/host_connected"
-		android:src="@android:drawable/presence_online"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentRight="true"
-		android:paddingTop="5dip"
-		/>
-		
-		<!-- 
-		
-	<TextView android:id="@+id/host_title"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		/>
-
-	<TextView android:id="@+id/host_caption"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		android:layout_below="@id/host_title"
-		/>
-		
-		 -->
-		
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		>
-
-	<TextView android:id="@+id/host_title"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		/>
-
-	<TextView android:id="@+id/host_caption"
-		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/res/layout/item_terminal.xml b/res/layout/item_terminal.xml
index 406ddd4..7415406 100644
--- a/res/layout/item_terminal.xml
+++ b/res/layout/item_terminal.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
@@ -12,14 +29,14 @@
 		android:gravity="center"
 		>
 
-	<TextView
-		android:id="@+id/terminal_overlay"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:background="#aa000000"
-		android:padding="10dip"
-		/>
+		<TextView
+			android:id="@+id/terminal_overlay"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:background="#aa000000"
+			android:padding="10dip"
+			/>
 	
 	</LinearLayout>
 
diff --git a/res/layout/main.xml b/res/layout/main.xml
deleted file mode 100644
index 9219a8f..0000000
--- a/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-    
-<TextView android:id="@+id/shell"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, SSH"
-    />
-</LinearLayout>
diff --git a/res/layout/message_dialog.xml b/res/layout/message_dialog.xml
deleted file mode 100644
index 4ed850a..0000000
--- a/res/layout/message_dialog.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/message" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/dismiss"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content" 
-            android:layout_below="@id/message"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="10dip"
-            android:text="@string/button_ok" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/password_dialog.xml b/res/layout/password_dialog.xml
deleted file mode 100644
index ab67979..0000000
--- a/res/layout/password_dialog.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content"
-                android:theme="@android:style/Theme.Dialog">
-
-    <TextView android:id="@+id/passwordLabel" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="Password:"/>
-
-    <EditText android:id="@+id/password" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:layout_below="@id/passwordLabel"
-              android:maxLines="1"
-              android:password="true"/>
-
-    <Button android:id="@+id/ok" 
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content" 
-            android:layout_below="@id/password"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="10dip"
-            android:text="@string/button_ok" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/pubkey.xml b/res/layout/pubkey.xml
deleted file mode 100644
index 1c2828a..0000000
--- a/res/layout/pubkey.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content">
-
-    <Button android:id="@+id/generate" 
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content" 
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="10dip"
-            android:text="@string/button_generate" />
-            
-    <TextView android:id="@+id/keyName" 
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:layout_below="@id/generate"
-              android:text="Username:"/>
-
-    <Button android:id="@+id/ok" 
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content" 
-            android:layout_below="@id/keyName"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="10dip"
-            android:text="@string/button_ok" />
-
-    <Button android:id="@+id/cancel"
-    		android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/ok"
-            android:layout_alignTop="@id/ok"
-            android:text="@string/button_cancel" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/secure_shell.xml b/res/layout/secure_shell.xml
deleted file mode 100644
index 471b4ed..0000000
--- a/res/layout/secure_shell.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <org.theb.ssh.TerminalView android:id="@+id/terminal"
-    	android:layout_width="fill_parent"
-    	android:layout_height="fill_parent"
-    	android:textSize="8sp"
-    	android:typeface="monospace" />
-<!-- 
-    <TextView android:id="@+id/output"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:textSize="8sp"
-        android:typeface="monospace" />
- -->
-</RelativeLayout>
diff --git a/res/layout/wiz_eula.xml b/res/layout/wiz_eula.xml
index 731a5ad..20af081 100644
--- a/res/layout/wiz_eula.xml
+++ b/res/layout/wiz_eula.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
diff --git a/res/layout/wiz_features.xml b/res/layout/wiz_features.xml
index 8ccf6b1..b6e07b1 100644
--- a/res/layout/wiz_features.xml
+++ b/res/layout/wiz_features.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
diff --git a/res/xml/host_prefs.xml b/res/xml/host_prefs.xml
index 9786416..c4afb5b 100644
--- a/res/xml/host_prefs.xml
+++ b/res/xml/host_prefs.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<EditTextPreference
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 2d19670..01fefc5 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<ListPreference
-- 
cgit v1.2.3