JamesDSPManager: Add notification icon.

Signed-off-by: Christos Papageorgiou <root.expert.xda@gmail.com>
Change-Id: I36c4cde0a7dad9c6dd32a866b8ae438b71b6e5a6

8 files changed, 36 insertions, 32 deletions

diff --git a/app/src/main/java/james/dsp/activity/DSPManager.java b/app/src/main/java/james/dsp/activity/DSPManager.java
index f5c7cb2..f7ef4ae 100644
--- a/app/src/main/java/james/dsp/activity/DSPManager.java
+++ b/app/src/main/java/james/dsp/activity/DSPManager.java
@@ -63,7 +63,7 @@ import android.widget.Toast;
 */
 public final class DSPManager extends Activity
 {
-    public static final String NOTIFICATION_CHANNEL = "1";
+    public static final String NOTIFICATION_CHANNEL = "james_dsp_channel";
 	public static Context actUi = null;
 
     //==================================
@@ -787,8 +787,9 @@ public final class DSPManager extends Activity
     private void initializeNotificationChannel() {
         final CharSequence name = getString(R.string.notification_channel_name);
         final int importance = NotificationManager.IMPORTANCE_LOW;
+        final String ChannelId = "01";
 
-        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL, name, importance);
+        NotificationChannel channel = new NotificationChannel(ChannelId, name, importance);
 
         // Register the channel with the system; you can't change the importance
         // or other notification behaviors after this
diff --git a/app/src/main/java/james/dsp/service/HeadsetService.java b/app/src/main/java/james/dsp/service/HeadsetService.java
index 6f4aaa5..3b08a11 100644
--- a/app/src/main/java/james/dsp/service/HeadsetService.java
+++ b/app/src/main/java/james/dsp/service/HeadsetService.java
@@ -1,8 +1,5 @@
 package james.dsp.service;
 
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
@@ -40,6 +37,7 @@ import java.util.Map;
 import java.util.UUID;
 import james.dsp.activity.JdspImpResToolbox;
 
+import static james.dsp.activity.DSPManager.NOTIFICATION_CHANNEL;
 import static james.dsp.activity.DSPManager.TAG;
 
 /**
@@ -426,24 +424,17 @@ public class HeadsetService extends Service
 	};
 	private void foregroundPersistent(String mFXType)
 	{
-		int mIconIDSmall = getResources().getIdentifier("ic_stat_icon", "drawable", getApplicationInfo().packageName);
 		Intent notificationIntent = new Intent(this, DSPManager.class);
-		PendingIntent contentItent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
-
-		final CharSequence name = getString(R.string.notification_channel_name);
-		final int importance = NotificationManager.IMPORTANCE_LOW;
+		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
 
 		if (Build.VERSION.SDK_INT >= 26) {
-			String CHANNEL_ID = "01";
-			NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
-
-			((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
-
-			Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
-					.setContentTitle("")
-					.setContentText("").build();
+			NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL);
+			builder.setSmallIcon(R.drawable.notification_icon);
+			builder.setContentTitle(getString(james.dsp.R.string.notification_string));
+			builder.setContentIntent(contentIntent);
+			builder.setPriority(NotificationCompat.PRIORITY_LOW);
 
-			startForeground(1, notification);
+			startForeground(1, builder.build());
 		}
 	}
 
@@ -475,20 +466,13 @@ class StartUpOptimiserThread implements Runnable {
 	{
 		super.onCreate();
 
-		final CharSequence name = getString(R.string.notification_channel_name);
-		final int importance = NotificationManager.IMPORTANCE_LOW;
-
 		if (Build.VERSION.SDK_INT >= 26) {
-			String CHANNEL_ID = "my_channel_01";
-			NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
-
-			((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
-
-			Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
-					.setContentTitle("")
-					.setContentText("").build();
+			NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL);
+			builder.setSmallIcon(R.drawable.notification_icon);
+			builder.setContentTitle(getString(james.dsp.R.string.notification_string));
+			builder.setPriority(NotificationCompat.PRIORITY_LOW);
 
-			startForeground(1, notification);
+			startForeground(1, builder.build());
 		}
 
 		IntentFilter audioFilter = new IntentFilter();
diff --git a/app/src/main/res/drawable-anydpi/notification_icon.xml b/app/src/main/res/drawable-anydpi/notification_icon.xml
new file mode 100644
index 0000000..f51be18
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/notification_icon.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="54.347828"
+    android:viewportHeight="54.347828"
+    android:tint="#FFFFFF">
+  <group android:translateX="2.173913"
+      android:translateY="2.173913">
+    <path
+        android:pathData="M25,22L25,28M31,17L31,33M37,7L37,43M43,16L43,34M7,16L7,34M13,7L13,43M19,17L19,33M49,22L49,28M1,22L1,28"
+        android:strokeAlpha="1"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/notification_icon.png b/app/src/main/res/drawable-hdpi/notification_icon.png
new file mode 100644
index 0000000..4778432
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-mdpi/notification_icon.png b/app/src/main/res/drawable-mdpi/notification_icon.png
new file mode 100644
index 0000000..c6d57ad
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-xhdpi/notification_icon.png b/app/src/main/res/drawable-xhdpi/notification_icon.png
new file mode 100644
index 0000000..b9447b7
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi/notification_icon.png b/app/src/main/res/drawable-xxhdpi/notification_icon.png
new file mode 100644
index 0000000..e8ef6b6
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/notification_icon.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5cf1fd..fb071bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,4 +139,5 @@
     GUI Author: Antti S. Lankila \n
   </string>
     <string name="advanced_options">Advanced Options</string>
-</resources>
\ No newline at end of file
+  <string name="notification_string">JamesDSP active</string>
+</resources>