altosdroid: Strings and Layout changes

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosdroid/res/layout/main.xml b/altosdroid/res/layout/main.xml
index 070928a55a0c9f529fa7aa6390796c65ad5ed15b..00ca63c8da8ce10feed788c9963bd8623cb6cd86 100644 (file)
--- a/altosdroid/res/layout/main.xml
+++ b/altosdroid/res/layout/main.xml
@@ -23,31 +23,11 @@
     <TextView
         android:id="@+id/in"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="0dip"
         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"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            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"
-            android:text="@string/send"
-        />
-    </LinearLayout>
 </LinearLayout>

diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index e3234fc74b41cd917ae2d911c81360705094a7fb..324641cd28c6228d4fc917b68e7904691112609f 100644 (file)
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -17,14 +17,15 @@
 <resources>
     <string name="app_name">AltosDroid</string>
 
-    <!--  BluetoothChat -->
-    <string name="send">Send</string>
-    <string name="not_connected">You are not connected to a device</string>
-    <string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string>
+    <!--  AltosDroid -->
+    <string name="bt_not_enabled">Bluetooth was not enabled.</string>
     <string name="title_connecting">connecting…</string>
     <string name="title_connected_to">connected: </string>
     <string name="title_not_connected">not connected</string>
 
+    <!-- Options Menu -->
+    <string name="connect_device">Connect a device</string>
+
     <!--  DeviceListActivity -->
     <string name="scanning">scanning for devices…</string>
     <string name="select_device">select a device to connect</string>
@@ -34,9 +35,6 @@
     <string name="title_other_devices">Other Available Devices</string>
     <string name="button_scan">Scan for devices</string>
 
-    <!-- Options Menu -->
-    <string name="connect_device">Connect a device</string>
-
     <!-- Service -->
     <string name="telemetry_service_label">AltosDroid Telemetry Service</string>
     <string name="telemetry_service_started">Telemetry Service Started</string>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index b8ddd5743245470f407ec81d53670dfe76f8910c..7b1b2aa377cdad6030e02628d883168b82f444db 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -327,7 +327,7 @@ public class AltosDroid extends Activity {
                                // User did not enable Bluetooth or an error occured
                                Log.d(TAG, "BT not enabled");
                                stopService(new Intent(AltosDroid.this, TelemetryService.class));
-                               Toast.makeText(this, R.string.bt_not_enabled_leaving, Toast.LENGTH_SHORT).show();
+                               Toast.makeText(this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show();
                                finish();
                        }
                }