diff --git a/Application/src/main/java/org/surfsite/iconsole/BluetoothChatService.java b/Application/src/main/java/org/surfsite/iconsole/BluetoothChatService.java index 4a0e6b5..dd7df78 100644 --- a/Application/src/main/java/org/surfsite/iconsole/BluetoothChatService.java +++ b/Application/src/main/java/org/surfsite/iconsole/BluetoothChatService.java @@ -94,8 +94,6 @@ public class BluetoothChatService extends Service { mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); - // Display a notification about us starting. We put an icon in the status bar. - showNotification(); } boolean startIConsole() { @@ -260,7 +258,7 @@ public class BluetoothChatService extends Service { // Start the thread to manage the connection and perform transmissions mConnectedThread = new ConnectedThread(socket); mConnectedThread.start(); - + showNotification(); // Send the name of the connected device back to the UI Activity Message msg = mHandler.obtainMessage(Constants.MESSAGE_DEVICE_NAME); Bundle bundle = new Bundle(); diff --git a/Application/src/main/res/layout/activity_device_list.xml b/Application/src/main/res/layout/activity_device_list.xml index ae7242c..0eb2c3d 100644 --- a/Application/src/main/res/layout/activity_device_list.xml +++ b/Application/src/main/res/layout/activity_device_list.xml @@ -23,10 +23,8 @@ android:id="@+id/title_paired_devices" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#666" android:paddingLeft="5dp" android:text="@string/title_paired_devices" - android:textColor="#fff" android:visibility="gone" /> @@ -42,10 +40,8 @@ android:id="@+id/title_new_devices" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#666" android:paddingLeft="5dp" android:text="@string/title_other_devices" - android:textColor="#fff" android:visibility="gone" /> diff --git a/Application/src/main/res/values/base-strings.xml b/Application/src/main/res/values/base-strings.xml index 4af8f7d..46393c7 100644 --- a/Application/src/main/res/values/base-strings.xml +++ b/Application/src/main/res/values/base-strings.xml @@ -16,13 +16,11 @@ --> - iConsole + OpeniConsole diff --git a/Application/src/main/res/values/strings.xml b/Application/src/main/res/values/strings.xml index 3700e15..4b9e87c 100644 --- a/Application/src/main/res/values/strings.xml +++ b/Application/src/main/res/values/strings.xml @@ -18,7 +18,7 @@ You are not connected to a device - Bluetooth was not enabled. Leaving Bluetooth Chat. + Bluetooth was not enabled. Leaving OpeniConsole. connecting... connected to %1$s not connected @@ -33,9 +33,6 @@ Scan for devices - Connect a device - Secure - Connect a device - Insecure - Make discoverable Start Stop Disconnect @@ -48,7 +45,8 @@ 0 0.0 Level - iConsole Bluetooth active + OpeniConsole Bluetooth active OpeniConsole + Connect to iConsole