Initial update for Android SDK M5 support.

8 files changed, 24 insertions, 22 deletions

diff --git a/res/layout/about_dialog.xml b/res/layout/about_dialog.xml
index 9a515fc..9ef62bc 100644
--- a/res/layout/about_dialog.xml
+++ b/res/layout/about_dialog.xml
@@ -5,7 +5,7 @@
                 android:layout_height="64px"
                 android:theme="@android:style/Theme.Dialog">
 
-	<ImageView id="@+id/icon"
+	<ImageView android:id="@+id/icon"
 				android:layout_width="75px"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
@@ -13,7 +13,7 @@
 				android:minWidth="64px"
 				android:src="@drawable/icon"/>
 	
-    <TextView id="@+id/copyright" 
+    <TextView android:id="@+id/copyright" 
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content" 
 				android:paddingLeft="10dip"
diff --git a/res/layout/host_editor.xml b/res/layout/host_editor.xml
index 98cd048..c25f98f 100644
--- a/res/layout/host_editor.xml
+++ b/res/layout/host_editor.xml
@@ -3,40 +3,40 @@
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content">
 
-    <TextView id="@+id/usernameLabel" 
+    <TextView android:id="@+id/usernameLabel" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content" 
               android:text="Username:"/>
 
-    <EditText id="@+id/username" 
+    <EditText android:id="@+id/username" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content" 
               android:layout_below="@id/usernameLabel"/>
 
-    <TextView id="@+id/hostnameLabel" 
+    <TextView android:id="@+id/hostnameLabel" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content"
               android:layout_below="@id/username" 
               android:text="Hostname:"/>
 
-    <EditText id="@+id/hostname" 
+    <EditText android:id="@+id/hostname" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content" 
               android:layout_below="@id/hostnameLabel"/>
                 
-	<TextView id="@+id/portLabel" 
+	<TextView android:id="@+id/portLabel" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content"
               android:layout_below="@id/hostname" 
               android:text="Port:"/>
 
-    <EditText id="@+id/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 id="@+id/add" 
+    <Button android:id="@+id/add" 
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content" 
             android:layout_below="@id/port"
@@ -44,7 +44,7 @@
             android:layout_marginLeft="10dip"
             android:text="@string/button_add" />
 
-    <Button id="@+id/cancel"
+    <Button android:id="@+id/cancel"
     		android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
             android:layout_toLeft="@id/add"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 37bd27a..ec1ce98 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
-<TextView id="@+id/shell"
+<TextView android:id="@+id/shell"
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" 
     android:text="Hello World, SSH"
diff --git a/res/layout/message_dialog.xml b/res/layout/message_dialog.xml
index 8720d92..4ed850a 100644
--- a/res/layout/message_dialog.xml
+++ b/res/layout/message_dialog.xml
@@ -3,11 +3,11 @@
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content">
 
-    <TextView id="@+id/message" 
+    <TextView android:id="@+id/message" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content" />
 
-    <Button id="@+id/dismiss"
+    <Button android:id="@+id/dismiss"
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content" 
             android:layout_below="@id/message"
diff --git a/res/layout/password_dialog.xml b/res/layout/password_dialog.xml
index df42486..ab67979 100644
--- a/res/layout/password_dialog.xml
+++ b/res/layout/password_dialog.xml
@@ -4,19 +4,19 @@
                 android:layout_height="wrap_content"
                 android:theme="@android:style/Theme.Dialog">
 
-    <TextView id="@+id/passwordLabel" 
+    <TextView android:id="@+id/passwordLabel" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content" 
               android:text="Password:"/>
 
-    <EditText id="@+id/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 id="@+id/ok" 
+    <Button android:id="@+id/ok" 
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content" 
             android:layout_below="@id/password"
diff --git a/res/layout/pubkey.xml b/res/layout/pubkey.xml
index d22fc5c..f031e3c 100644
--- a/res/layout/pubkey.xml
+++ b/res/layout/pubkey.xml
@@ -3,20 +3,20 @@
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content">
 
-    <Button id="@+id/generate" 
+    <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 id="@+id/keyName" 
+    <TextView android:id="@+id/keyName" 
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content" 
               android:layout_below="@id/generate"
               android:text="Username:"/>
 
-    <Button id="@+id/ok" 
+    <Button android:id="@+id/ok" 
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content" 
             android:layout_below="@id/keyName"
@@ -24,7 +24,7 @@
             android:layout_marginLeft="10dip"
             android:text="@string/button_ok" />
 
-    <Button id="@+id/cancel"
+    <Button android:id="@+id/cancel"
     		android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
             android:layout_toLeft="@id/ok"
diff --git a/res/layout/secure_shell.xml b/res/layout/secure_shell.xml
index 9af5081..471b4ed 100644
--- a/res/layout/secure_shell.xml
+++ b/res/layout/secure_shell.xml
@@ -3,13 +3,13 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <org.theb.ssh.TerminalView id="@+id/terminal"
+    <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 id="@+id/output"
+    <TextView android:id="@+id/output"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:textSize="8sp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66a3b50..6c11b04 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,6 +27,8 @@
     <string name="button_change">Change</string>
     <string name="button_generate">Generate Key</string>
     
+    <string name="alert_disconnect_msg">Connection Lost</string>
+    
     <string name="msg_copyright">Copyright &#169; 2007, Kenny Root http://the-b.org/</string>
     <string name="msg_version">v1.0</string>
 </resources>