From 341ecf5781f9e8ba5b979d5b6c94a2683bdfb304 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Mon, 17 Aug 2015 16:44:16 +0200
Subject: [PATCH] UART divides long text into 20B parts

UART now checks the RX characteristic properties and:
1) it will use long write if WRITE REQUEST is set,
2) it will divide the text into up to 20-bytes packets
Also the app background has been fixed.
---
 app/app.iml                                   | 16 ++--
 app/build.gradle                              |  6 +-
 .../nrftoolbox/profile/BleManager.java        | 17 +++-
 .../android/nrftoolbox/uart/UARTManager.java  | 80 +++++++++++++++----
 app/src/main/res/drawable/background.xml      | 34 --------
 .../res/layout-land/activity_feature_bpm.xml  |  8 ++
 .../res/layout-land/activity_feature_csc.xml  |  8 ++
 .../res/layout-land/activity_feature_dfu.xml  |  8 ++
 .../res/layout-land/activity_feature_gls.xml  |  8 ++
 .../res/layout-land/activity_feature_hrs.xml  |  8 ++
 .../res/layout-land/activity_feature_hts.xml  |  7 ++
 .../activity_feature_proximity.xml            |  8 ++
 .../res/layout-land/activity_feature_rsc.xml  |  8 ++
 .../fragment_feature_uart_control.xml         |  9 +++
 .../activity_feature_bpm.xml                  |  8 ++
 .../activity_feature_csc.xml                  |  8 ++
 .../activity_feature_dfu.xml                  |  8 ++
 .../activity_feature_hrs.xml                  |  8 ++
 .../activity_feature_rsc.xml                  |  8 ++
 .../main/res/layout/activity_feature_bpm.xml  |  8 ++
 .../main/res/layout/activity_feature_csc.xml  |  8 ++
 .../main/res/layout/activity_feature_dfu.xml  |  8 ++
 .../main/res/layout/activity_feature_gls.xml  |  8 ++
 .../main/res/layout/activity_feature_hrs.xml  |  8 ++
 .../main/res/layout/activity_feature_hts.xml  |  7 ++
 .../res/layout/activity_feature_proximity.xml |  8 ++
 .../main/res/layout/activity_feature_rsc.xml  |  8 ++
 .../res/layout/activity_feature_template.xml  |  8 ++
 app/src/main/res/layout/activity_features.xml |  7 ++
 app/src/main/res/layout/activity_settings.xml | 16 +++-
 .../main/res/layout/activity_splashscreen.xml |  7 ++
 .../layout/fragment_feature_uart_control.xml  | 17 ++--
 app/src/main/res/values/styles.xml            |  4 +-
 build.gradle                                  |  2 +-
 nRFToolbox.iml                                |  2 +-
 35 files changed, 316 insertions(+), 75 deletions(-)
 delete mode 100644 app/src/main/res/drawable/background.xml

diff --git a/app/app.iml b/app/app.iml
index 8b30910ab..87f544ece 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -34,13 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -70,7 +72,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -89,7 +91,7 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="design-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="nrf-logger-v2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 3abb9f5f0..6c4ba7ebb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 22
-        versionCode 35
-        versionName "1.14.2"
+        versionCode 36
+        versionName "1.14.3"
     }
     buildTypes {
         release {
@@ -21,7 +21,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:design:22.2.0'
+    compile 'com.android.support:design:22.2.1'
     compile project(':dfu')
     compile files('libs/achartengine-1.1.0.jar')
     compile files('libs/nrf-logger-v2.0.jar')
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
index 566a0debb..f0aeae0e3 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
@@ -340,6 +340,7 @@ protected final boolean enableNotifications(final BluetoothGattCharacteristic ch
 		if ((properties & BluetoothGattCharacteristic.PROPERTY_NOTIFY) == 0)
 			return false;
 
+		Logger.d(mLogSession, "gatt.setCharacteristicNotification(" + characteristic.getUuid() + ", true)");
 		gatt.setCharacteristicNotification(characteristic, true);
 		final BluetoothGattDescriptor descriptor = characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID);
 		if (descriptor != null) {
@@ -366,6 +367,7 @@ protected final boolean enableIndications(final BluetoothGattCharacteristic char
 		if ((properties & BluetoothGattCharacteristic.PROPERTY_INDICATE) == 0)
 			return false;
 
+		Logger.d(mLogSession, "gatt.setCharacteristicNotification(" + characteristic.getUuid() + ", true)");
 		gatt.setCharacteristicNotification(characteristic, true);
 		final BluetoothGattDescriptor descriptor = characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID);
 		if (descriptor != null) {
@@ -414,7 +416,7 @@ protected final boolean writeCharacteristic(final BluetoothGattCharacteristic ch
 		if ((properties & (BluetoothGattCharacteristic.PROPERTY_WRITE | BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)) == 0)
 			return false;
 
-		Logger.v(mLogSession, "Writing characteristic " + characteristic.getUuid());
+		Logger.v(mLogSession, "Writing characteristic " + characteristic.getUuid() + " (" + getWriteType(characteristic.getWriteType()) + ")");
 		Logger.d(mLogSession, "gatt.writeCharacteristic(" + characteristic.getUuid() + ")");
 		return gatt.writeCharacteristic(characteristic);
 	}
@@ -921,4 +923,17 @@ private String bondStateToString(final int state) {
 				return "UNKNOWN";
 		}
 	}
+
+	private String getWriteType(final int type) {
+		switch (type) {
+			case BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT:
+				return "WRITE REQUEST";
+			case BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE:
+				return "WRITE COMMAND";
+			case BluetoothGattCharacteristic.WRITE_TYPE_SIGNED:
+				return "WRITE SIGNED";
+			default:
+				return "UNKNOWN: " + type;
+		}
+	}
 }
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java
index 65b9c25ff..1f72f65cb 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java
@@ -26,7 +26,9 @@
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
+import android.text.TextUtils;
 
+import java.io.UnsupportedEncodingException;
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.UUID;
@@ -36,12 +38,16 @@
 public class UARTManager extends BleManager<UARTManagerCallbacks> {
 	/** Nordic UART Service UUID */
 	private final static UUID UART_SERVICE_UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E");
-	/** TX characteristic UUID */
-	private final static UUID UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400002-B5A3-F393-E0A9-E50E24DCCA9E");
 	/** RX characteristic UUID */
-	private final static UUID UART_RX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E");
+	private final static UUID UART_RX_CHARACTERISTIC_UUID = UUID.fromString("6E400002-B5A3-F393-E0A9-E50E24DCCA9E");
+	/** TX characteristic UUID */
+	private final static UUID UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E");
+	/** The maximum packet size is 20 bytes. */
+	private static final int MAX_PACKET_SIZE = 20;
 
-	private BluetoothGattCharacteristic mTXCharacteristic, mRXCharacteristic;
+	private BluetoothGattCharacteristic mRXCharacteristic, mTXCharacteristic;
+	private byte[] mOutgoingBuffer;
+	private int mBufferOffset;
 
 	public UARTManager(final Context context) {
 		super(context);
@@ -60,7 +66,7 @@ protected BleManagerGattCallback getGattCallback() {
 		@Override
 		protected Queue<Request> initGatt(final BluetoothGatt gatt) {
 			final LinkedList<Request> requests = new LinkedList<>();
-			requests.push(Request.newEnableNotificationsRequest(mRXCharacteristic));
+			requests.push(Request.newEnableNotificationsRequest(mTXCharacteristic));
 			return requests;
 		}
 
@@ -68,22 +74,51 @@ protected Queue<Request> initGatt(final BluetoothGatt gatt) {
 		public boolean isRequiredServiceSupported(final BluetoothGatt gatt) {
 			final BluetoothGattService service = gatt.getService(UART_SERVICE_UUID);
 			if (service != null) {
-				mTXCharacteristic = service.getCharacteristic(UART_TX_CHARACTERISTIC_UUID);
 				mRXCharacteristic = service.getCharacteristic(UART_RX_CHARACTERISTIC_UUID);
+				mTXCharacteristic = service.getCharacteristic(UART_TX_CHARACTERISTIC_UUID);
+			}
+
+			boolean writeRequest = false;
+			boolean writeCommand = false;
+			if (mRXCharacteristic != null) {
+				final int rxProperties = mRXCharacteristic.getProperties();
+				writeRequest = (rxProperties & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0;
+				writeCommand = (rxProperties & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) > 0;
+
+				// Set the WRITE REQUEST type when the characteristic supports it. This will allow to send long write (also if the characteristic support it).
+				// In case there is no WRITE REQUEST property, this manager will divide texts longer then 20 bytes into up to 20 bytes chunks.
+				if (writeRequest)
+					mRXCharacteristic.setWriteType(BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT);
 			}
-			return mTXCharacteristic != null && mRXCharacteristic != null;
+
+			return mRXCharacteristic != null && mTXCharacteristic != null && (writeRequest || writeCommand);
 		}
 
 		@Override
 		protected void onDeviceDisconnected() {
-			mTXCharacteristic = null;
 			mRXCharacteristic = null;
+			mTXCharacteristic = null;
 		}
 
 		@Override
 		public void onCharacteristicWrite(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
-			final String data = characteristic.getStringValue(0);
-			mCallbacks.onDataSent(data);
+			// When the whole buffer has been sent
+			final byte[] buffer = mOutgoingBuffer;
+			if (mBufferOffset == buffer.length) {
+				try {
+					mCallbacks.onDataSent(new String(buffer, "UTF-8"));
+				} catch (final UnsupportedEncodingException e) {
+					// do nothing
+				}
+				mOutgoingBuffer = null;
+			} else { // Otherwise...
+				final int length = Math.min(buffer.length - mBufferOffset, MAX_PACKET_SIZE);
+				final byte[] data = new byte[length]; // We send at most 20 bytes
+				System.arraycopy(buffer, mBufferOffset, data, 0, length);
+				mBufferOffset += length;
+				mRXCharacteristic.setValue(data);
+				writeCharacteristic(mRXCharacteristic);
+			}
 		}
 
 		@Override
@@ -100,13 +135,30 @@ protected boolean shouldAutoConnect() {
 	}
 
 	/**
-	 * Sends the given text to TH characteristic.
+	 * Sends the given text to RX characteristic.
 	 * @param text the text to be sent
 	 */
 	public void send(final String text) {
-		if (mTXCharacteristic != null) {
-			mTXCharacteristic.setValue(text);
-			writeCharacteristic(mTXCharacteristic);
+		// An outgoing buffer may not be null if there is already another packet being sent. We do nothing in this case.
+		if (!TextUtils.isEmpty(text) && mOutgoingBuffer == null) {
+			final byte[] buffer = mOutgoingBuffer = text.getBytes();
+			mBufferOffset = 0;
+
+			// Depending on whether the characteristic has the WRITE REQUEST property or not, we will either send it as it is (hoping the long write is implemented),
+			// or divide it into up to 20 bytes chunks and send them one by one.
+			final boolean writeRequest = (mRXCharacteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_WRITE) > 0;
+
+			if (!writeRequest) { // no WRITE REQUEST property
+				final int length = Math.min(buffer.length, MAX_PACKET_SIZE);
+				final byte[] data = new byte[length]; // We send at most 20 bytes
+				System.arraycopy(buffer, 0, data, 0, length);
+				mBufferOffset += length;
+				mRXCharacteristic.setValue(data);
+			} else { // there is WRITE REQUEST property
+				mRXCharacteristic.setValue(buffer);
+				mBufferOffset = buffer.length;
+			}
+			writeCharacteristic(mRXCharacteristic);
 		}
 	}
 }
diff --git a/app/src/main/res/drawable/background.xml b/app/src/main/res/drawable/background.xml
deleted file mode 100644
index bb025afee..000000000
--- a/app/src/main/res/drawable/background.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015, Nordic Semiconductor
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-  ~
-  ~ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-  ~
-  ~ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
-  ~ documentation and/or other materials provided with the distribution.
-  ~
-  ~ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
-  ~ software without specific prior written permission.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  ~ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-  ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-  ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:drawable="@drawable/background_image"/>
-    <item android:bottom="@dimen/navigation_bar_height"
-        android:right="@dimen/navigation_bar_width">
-        <bitmap
-            android:gravity="bottom|center_horizontal"
-            android:src="@drawable/background_title" />
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_feature_bpm.xml b/app/src/main/res/layout-land/activity_feature_bpm.xml
index 12e5413e4..f6cefee97 100644
--- a/app/src/main/res/layout-land/activity_feature_bpm.xml
+++ b/app/src/main/res/layout-land/activity_feature_bpm.xml
@@ -293,5 +293,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/activity_feature_csc.xml b/app/src/main/res/layout-land/activity_feature_csc.xml
index ebca3ded6..62b33c0c8 100644
--- a/app/src/main/res/layout-land/activity_feature_csc.xml
+++ b/app/src/main/res/layout-land/activity_feature_csc.xml
@@ -290,5 +290,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_feature_dfu.xml b/app/src/main/res/layout-land/activity_feature_dfu.xml
index 0bae49de2..4ba202526 100644
--- a/app/src/main/res/layout-land/activity_feature_dfu.xml
+++ b/app/src/main/res/layout-land/activity_feature_dfu.xml
@@ -260,5 +260,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_select" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_feature_gls.xml b/app/src/main/res/layout-land/activity_feature_gls.xml
index 8ebf5124c..d87b2c402 100644
--- a/app/src/main/res/layout-land/activity_feature_gls.xml
+++ b/app/src/main/res/layout-land/activity_feature_gls.xml
@@ -214,5 +214,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_feature_hrs.xml b/app/src/main/res/layout-land/activity_feature_hrs.xml
index f957104d8..a679e2a11 100644
--- a/app/src/main/res/layout-land/activity_feature_hrs.xml
+++ b/app/src/main/res/layout-land/activity_feature_hrs.xml
@@ -148,5 +148,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/activity_feature_hts.xml b/app/src/main/res/layout-land/activity_feature_hts.xml
index 77382b0de..71a5942dc 100644
--- a/app/src/main/res/layout-land/activity_feature_hts.xml
+++ b/app/src/main/res/layout-land/activity_feature_hts.xml
@@ -107,6 +107,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
 
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_feature_proximity.xml b/app/src/main/res/layout-land/activity_feature_proximity.xml
index 402779933..ce1e6ef0b 100644
--- a/app/src/main/res/layout-land/activity_feature_proximity.xml
+++ b/app/src/main/res/layout-land/activity_feature_proximity.xml
@@ -121,5 +121,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_feature_rsc.xml b/app/src/main/res/layout-land/activity_feature_rsc.xml
index 4ad44d492..3af7e01e4 100644
--- a/app/src/main/res/layout-land/activity_feature_rsc.xml
+++ b/app/src/main/res/layout-land/activity_feature_rsc.xml
@@ -320,5 +320,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_feature_uart_control.xml b/app/src/main/res/layout-land/fragment_feature_uart_control.xml
index 73f6dc6fb..df639f85e 100644
--- a/app/src/main/res/layout-land/fragment_feature_uart_control.xml
+++ b/app/src/main/res/layout-land/fragment_feature_uart_control.xml
@@ -23,6 +23,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/background_image"
     android:orientation="vertical" >
 
     <!-- The size of text below must be fixed, therefore dp are used instead of sp -->
@@ -91,4 +92,12 @@
         android:layout_height="@dimen/activity_vertical_margin_bottom"
         android:layout_alignParentBottom="true" />
 
+	<ImageView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:src="@drawable/background_title"
+		android:layout_alignParentBottom="true"
+		android:layout_centerHorizontal="true"
+		android:layout_marginBottom="6dp"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/activity_feature_bpm.xml b/app/src/main/res/layout-sw600dp-land/activity_feature_bpm.xml
index 68c1a7f62..3aa8760c8 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_feature_bpm.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_feature_bpm.xml
@@ -294,5 +294,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp-land/activity_feature_csc.xml b/app/src/main/res/layout-sw600dp-land/activity_feature_csc.xml
index 25c950551..a85b5ac52 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_feature_csc.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_feature_csc.xml
@@ -252,5 +252,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml b/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
index 8ef3063a0..25e184480 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
@@ -253,5 +253,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_select" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/activity_feature_hrs.xml b/app/src/main/res/layout-sw600dp-land/activity_feature_hrs.xml
index e18c264a8..c3b2858e1 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_feature_hrs.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_feature_hrs.xml
@@ -149,5 +149,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw720dp-land/activity_feature_rsc.xml b/app/src/main/res/layout-sw720dp-land/activity_feature_rsc.xml
index 6f7099acc..99c3b6ecc 100644
--- a/app/src/main/res/layout-sw720dp-land/activity_feature_rsc.xml
+++ b/app/src/main/res/layout-sw720dp-land/activity_feature_rsc.xml
@@ -287,5 +287,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_bpm.xml b/app/src/main/res/layout/activity_feature_bpm.xml
index 2fd9c2ff5..fbb5ed445 100644
--- a/app/src/main/res/layout/activity_feature_bpm.xml
+++ b/app/src/main/res/layout/activity_feature_bpm.xml
@@ -281,5 +281,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_feature_csc.xml b/app/src/main/res/layout/activity_feature_csc.xml
index 25c950551..a85b5ac52 100644
--- a/app/src/main/res/layout/activity_feature_csc.xml
+++ b/app/src/main/res/layout/activity_feature_csc.xml
@@ -252,5 +252,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_dfu.xml b/app/src/main/res/layout/activity_feature_dfu.xml
index 466f97d7a..e879be913 100644
--- a/app/src/main/res/layout/activity_feature_dfu.xml
+++ b/app/src/main/res/layout/activity_feature_dfu.xml
@@ -254,5 +254,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_select" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_gls.xml b/app/src/main/res/layout/activity_feature_gls.xml
index e15e017d8..7f0012bec 100644
--- a/app/src/main/res/layout/activity_feature_gls.xml
+++ b/app/src/main/res/layout/activity_feature_gls.xml
@@ -212,5 +212,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_hrs.xml b/app/src/main/res/layout/activity_feature_hrs.xml
index e94bdc501..dcc1a5bc4 100644
--- a/app/src/main/res/layout/activity_feature_hrs.xml
+++ b/app/src/main/res/layout/activity_feature_hrs.xml
@@ -142,5 +142,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_feature_hts.xml b/app/src/main/res/layout/activity_feature_hts.xml
index 77382b0de..71a5942dc 100644
--- a/app/src/main/res/layout/activity_feature_hts.xml
+++ b/app/src/main/res/layout/activity_feature_hts.xml
@@ -107,6 +107,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
 
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_proximity.xml b/app/src/main/res/layout/activity_feature_proximity.xml
index f6a1c730f..109c13001 100644
--- a/app/src/main/res/layout/activity_feature_proximity.xml
+++ b/app/src/main/res/layout/activity_feature_proximity.xml
@@ -116,5 +116,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_rsc.xml b/app/src/main/res/layout/activity_feature_rsc.xml
index 6f7099acc..99c3b6ecc 100644
--- a/app/src/main/res/layout/activity_feature_rsc.xml
+++ b/app/src/main/res/layout/activity_feature_rsc.xml
@@ -287,5 +287,13 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feature_template.xml b/app/src/main/res/layout/activity_feature_template.xml
index 562203a1f..1ac1b86c2 100644
--- a/app/src/main/res/layout/activity_feature_template.xml
+++ b/app/src/main/res/layout/activity_feature_template.xml
@@ -141,6 +141,14 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect" />
 
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/background_title"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"/>
+
     </no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_features.xml b/app/src/main/res/layout/activity_features.xml
index 970386390..3cb702ba7 100644
--- a/app/src/main/res/layout/activity_features.xml
+++ b/app/src/main/res/layout/activity_features.xml
@@ -59,6 +59,13 @@
                 android:paddingTop="@dimen/feature_grid_margin_top"
                 android:stretchMode="columnWidth" />
 
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/background_title"
+                android:layout_gravity="bottom|center"
+                android:layout_marginBottom="6dp"/>
+
             <no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
                 android:id="@android:id/empty"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 51915c640..e624738f3 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -21,7 +21,7 @@
   ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
@@ -30,11 +30,19 @@
 		layout="@layout/toolbar"
 		android:id="@+id/toolbar_actionbar"/>
 
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/background_title"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="6dp"/>
+
 	<FrameLayout
 		style="@style/HeaderShadow"
 		android:id="@+id/content"
+        android:layout_below="@+id/toolbar_actionbar"
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1" />
+		android:layout_height="match_parent" />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_splashscreen.xml b/app/src/main/res/layout/activity_splashscreen.xml
index 687d33376..8d26b46a1 100644
--- a/app/src/main/res/layout/activity_splashscreen.xml
+++ b/app/src/main/res/layout/activity_splashscreen.xml
@@ -33,4 +33,11 @@
         android:scaleType="center"
         android:src="@drawable/nordic_logo" />
 
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/background_title"
+        android:layout_gravity="bottom|center"
+        android:layout_marginBottom="6dp"/>
+
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_feature_uart_control.xml b/app/src/main/res/layout/fragment_feature_uart_control.xml
index cd23cb66c..8ab45d371 100644
--- a/app/src/main/res/layout/fragment_feature_uart_control.xml
+++ b/app/src/main/res/layout/fragment_feature_uart_control.xml
@@ -23,16 +23,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+	android:background="@drawable/background_image"
     android:orientation="vertical" >
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/navigation_bar_fix"
-        android:layout_marginTop="@dimen/navigation_toolbar_fix"
-        android:clickable="true"
-        android:background="@drawable/background" />
-
     <!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
     <no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
@@ -99,4 +92,12 @@
         android:layout_height="@dimen/activity_vertical_margin_bottom"
         android:layout_alignParentBottom="true" />
 
+	<ImageView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:src="@drawable/background_title"
+		android:layout_alignParentBottom="true"
+		android:layout_centerHorizontal="true"
+		android:layout_marginBottom="6dp"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 533a2b472..ae8fa74ce 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -108,7 +108,7 @@
     </style>
 
     <style name="AppThemeBase" parent="@style/Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowBackground">@drawable/background</item>
+        <item name="android:windowBackground">@drawable/background_image</item>
         <item name="actionMenuTextColor">@color/actionBarMenuTextColor</item>
         <item name="alertDialogTheme">@style/AppTheme.DialogTheme</item>
         <item name="colorPrimary">@color/actionBarColor</item>
@@ -135,7 +135,7 @@
     </style>
 
     <style name="AppTheme.Fullscreen" parent="@style/Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowBackground">@drawable/background</item>
+        <item name="android:windowBackground">@drawable/background_image</item>
     </style>
 
 </resources>
diff --git a/build.gradle b/build.gradle
index 9405f3fd1..1b7886d14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/nRFToolbox.iml b/nRFToolbox.iml
index ed8f9c1f3..e37ba8751 100644
--- a/nRFToolbox.iml
+++ b/nRFToolbox.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />