From aa8e7207e778b3a14951c7cd19c8c24ac2245748 Mon Sep 17 00:00:00 2001
From: Antonis Tsakiridis <antonis.tsakiridis@telestax.com>
Date: Fri, 23 Sep 2016 16:21:58 +0300
Subject: [PATCH] Fixed #406: Testing with Android 5.1 revealed some UI issues
 with Notifications

---
 Examples/restcomm-olympus/app/olympus-version.properties    | 4 ++--
 .../restcomm-android-sdk-version.properties                 | 4 ++--
 .../src/main/java/org/restcomm/android/sdk/RCDevice.java    | 6 +++---
 restcomm.android.sdk/src/main/res/drawable/ic_call_24dp.xml | 2 +-
 .../src/main/res/drawable/ic_call_end_24dp.xml              | 2 +-
 restcomm.android.sdk/src/main/res/drawable/ic_chat_24dp.xml | 2 +-
 restcomm.android.sdk/src/main/res/drawable/ic_mic_24dp.xml  | 2 +-
 .../src/main/res/drawable/ic_mic_off_24dp.xml               | 2 +-
 .../src/main/res/drawable/ic_phone_in_talk_24dp.xml         | 2 +-
 .../src/main/res/drawable/ic_phone_missed_24dp.xml          | 2 +-
 .../src/main/res/drawable/ic_videocam_24dp.xml              | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Examples/restcomm-olympus/app/olympus-version.properties b/Examples/restcomm-olympus/app/olympus-version.properties
index 11fa80f4..dce3af8a 100644
--- a/Examples/restcomm-olympus/app/olympus-version.properties
+++ b/Examples/restcomm-olympus/app/olympus-version.properties
@@ -1,2 +1,2 @@
-#Fri Sep 23 14:26:47 EEST 2016
-VERSION_CODE=1500
+#Fri Sep 23 16:17:44 EEST 2016
+VERSION_CODE=1502
diff --git a/restcomm.android.sdk/restcomm-android-sdk-version.properties b/restcomm.android.sdk/restcomm-android-sdk-version.properties
index e0c1fb52..0fc24cc0 100644
--- a/restcomm.android.sdk/restcomm-android-sdk-version.properties
+++ b/restcomm.android.sdk/restcomm-android-sdk-version.properties
@@ -1,2 +1,2 @@
-#Fri Sep 23 14:26:47 EEST 2016
-VERSION_CODE=1523
+#Fri Sep 23 16:17:44 EEST 2016
+VERSION_CODE=1525
diff --git a/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java b/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java
index b2bad045..83314ae3 100644
--- a/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java
+++ b/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java
@@ -1183,9 +1183,9 @@ void onNotificationCall(RCConnection connection, HashMap<String, String> customH
                   // Need this to show up as Heads-up Notification
                   .setPriority(NotificationCompat.PRIORITY_HIGH)
                   .setAutoCancel(true)  // cancel notification when user acts on it (Important: only applies to default notification area, not additional actions)
-                  .addAction(R.drawable.ic_videocam_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentVideo, PendingIntent.FLAG_UPDATE_CURRENT))
-                  .addAction(R.drawable.ic_call_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentAudio, PendingIntent.FLAG_UPDATE_CURRENT))
-                  .addAction(R.drawable.ic_call_end_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDecline, PendingIntent.FLAG_UPDATE_CURRENT))
+                  .addAction(R.drawable.ic_videocam_24dp, "Video", PendingIntent.getService(getApplicationContext(), 0, serviceIntentVideo, PendingIntent.FLAG_UPDATE_CURRENT))
+                  .addAction(R.drawable.ic_call_24dp, "Audio", PendingIntent.getService(getApplicationContext(), 0, serviceIntentAudio, PendingIntent.FLAG_UPDATE_CURRENT))
+                  .addAction(R.drawable.ic_call_end_24dp, "Hang Up", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDecline, PendingIntent.FLAG_UPDATE_CURRENT))
                   .setVibrate(notificationVibrationPattern)
                   .setLights(notificationColor, notificationColorPattern[0], notificationColorPattern[1])
                   .setContentIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDefault, PendingIntent.FLAG_UPDATE_CURRENT))
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_call_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_call_24dp.xml
index ebf9de60..28914c6f 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_call_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_call_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_call_end_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_call_end_24dp.xml
index f83a5349..aa4191ab 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_call_end_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_call_end_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.87,1.12 -2.66,1.85 -0.18,0.18 -0.43,0.28 -0.7,0.28 -0.28,0 -0.53,-0.11 -0.71,-0.29L0.29,13.08c-0.18,-0.17 -0.29,-0.42 -0.29,-0.7 0,-0.28 0.11,-0.53 0.29,-0.71C3.34,8.78 7.46,7 12,7s8.66,1.78 11.71,4.67c0.18,0.18 0.29,0.43 0.29,0.71 0,0.28 -0.11,0.53 -0.29,0.71l-2.48,2.48c-0.18,0.18 -0.43,0.29 -0.71,0.29 -0.27,0 -0.52,-0.11 -0.7,-0.28 -0.79,-0.74 -1.69,-1.36 -2.67,-1.85 -0.33,-0.16 -0.56,-0.5 -0.56,-0.9v-3.1C15.15,9.25 13.6,9 12,9z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_chat_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_chat_24dp.xml
index e3489bde..bf19837b 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_chat_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_chat_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_mic_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_mic_24dp.xml
index 4f0dc044..c0633e87 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_mic_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_mic_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_mic_off_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_mic_off_24dp.xml
index 7b1759b3..0891fb32 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_mic_off_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_mic_off_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,11h-1.7c0,0.74 -0.16,1.43 -0.43,2.05l1.23,1.23c0.56,-0.98 0.9,-2.09 0.9,-3.28zM14.98,11.17c0,-0.06 0.02,-0.11 0.02,-0.17L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v0.18l5.98,5.99zM4.27,3L3,4.27l6.01,6.01L9.01,11c0,1.66 1.33,3 2.99,3 0.22,0 0.44,-0.03 0.65,-0.08l1.66,1.66c-0.71,0.33 -1.5,0.52 -2.31,0.52 -2.76,0 -5.3,-2.1 -5.3,-5.1L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c0.91,-0.13 1.77,-0.45 2.54,-0.9L19.73,21 21,19.73 4.27,3z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_phone_in_talk_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_phone_in_talk_24dp.xml
index b48b9ede..5aa74907 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_phone_in_talk_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_phone_in_talk_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM19,12h2c0,-4.97 -4.03,-9 -9,-9v2c3.87,0 7,3.13 7,7zM15,12h2c0,-2.76 -2.24,-5 -5,-5v2c1.66,0 3,1.34 3,3z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_phone_missed_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_phone_missed_24dp.xml
index b2338317..ae5765d8 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_phone_missed_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_phone_missed_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6.5,5.5L12,11l7,-7 -1,-1 -6,6 -4.5,-4.5L11,4.5L11,3L5,3v6h1.5L6.5,5.5zM23.71,16.67C20.66,13.78 16.54,12 12,12 7.46,12 3.34,13.78 0.29,16.67c-0.18,0.18 -0.29,0.43 -0.29,0.71s0.11,0.53 0.29,0.71l2.48,2.48c0.18,0.18 0.43,0.29 0.71,0.29 0.27,0 0.52,-0.11 0.7,-0.28 0.79,-0.74 1.69,-1.36 2.66,-1.85 0.33,-0.16 0.56,-0.5 0.56,-0.9v-3.1c1.45,-0.48 3,-0.73 4.6,-0.73 1.6,0 3.15,0.25 4.6,0.72v3.1c0,0.39 0.23,0.74 0.56,0.9 0.98,0.49 1.87,1.12 2.67,1.85 0.18,0.18 0.43,0.28 0.7,0.28 0.28,0 0.53,-0.11 0.71,-0.29l2.48,-2.48c0.18,-0.18 0.29,-0.43 0.29,-0.71s-0.12,-0.52 -0.3,-0.7z"/>
 </vector>
diff --git a/restcomm.android.sdk/src/main/res/drawable/ic_videocam_24dp.xml b/restcomm.android.sdk/src/main/res/drawable/ic_videocam_24dp.xml
index e23eac81..4f58f22a 100644
--- a/restcomm.android.sdk/src/main/res/drawable/ic_videocam_24dp.xml
+++ b/restcomm.android.sdk/src/main/res/drawable/ic_videocam_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
 </vector>