Merge remote-tracking branch 'mjb/master'

1 files changed, 16 insertions, 9 deletions

diff --git a/altosdroid/res/layout/main.xml b/altosdroid/res/layout/main.xml
index 17025f6b..070928a5 100644
--- a/altosdroid/res/layout/main.xml
+++ b/altosdroid/res/layout/main.xml
@@ -19,24 +19,31 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
-    <ListView android:id="@+id/in"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:stackFromBottom="true"
-        android:transcriptMode="alwaysScroll"
+
+    <TextView
+        android:id="@+id/in"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:layout_weight="1"
-    />
+        android:gravity="bottom"
+        android:scrollbars="vertical"
+        android:textSize="7dp"
+        android:typeface="monospace" />
+
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         >
-        <EditText android:id="@+id/edit_text_out"
+
+        <EditText
+            android:id="@+id/edit_text_out"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_gravity="bottom"
-        />
+            android:layout_weight="1"
+            android:inputType="text|textNoSuggestions" />
+
         <Button android:id="@+id/button_send"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"