diff options
| -rw-r--r-- | altosdroid/res/layout/main.xml | 22 | ||||
| -rw-r--r-- | altosdroid/res/values/strings.xml | 12 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 2 |
3 files changed, 7 insertions, 29 deletions
diff --git a/altosdroid/res/layout/main.xml b/altosdroid/res/layout/main.xml index 070928a5..00ca63c8 100644 --- 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 e3234fc7..324641cd 100644 --- 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 b8ddd574..7b1b2aa3 100644 --- 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(); } } |