Merge branch 'develop' into send_file_pr311_with_develop

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / managers / OCNotificationManager.java

diff --git a/src/com/owncloud/android/files/managers/OCNotificationManager.java b/src/com/owncloud/android/files/managers/OCNotificationManager.java
index 11a8c37..47fb491 100644 (file)
--- a/src/com/owncloud/android/files/managers/OCNotificationManager.java
+++ b/src/com/owncloud/android/files/managers/OCNotificationManager.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.owncloud.android.R;
 import java.util.Map;
 
 import com.owncloud.android.R;

+import com.owncloud.android.utils.DisplayUtils;

 
 import android.app.Notification;
 import android.app.NotificationManager;
 
 import android.app.Notification;
 import android.app.NotificationManager;


@@ -101,7 +102,7 @@ public class OCNotificationManager {
         
         switch (type) {
             case NOTIFICATION_SIMPLE:
         
         switch (type) {
             case NOTIFICATION_SIMPLE:

-                notification = new Notification(R.drawable.icon, data.getText(), System.currentTimeMillis());
+                notification = new Notification(DisplayUtils.getSeasonalIconId(), data.getText(), System.currentTimeMillis());

                 break;
             case NOTIFICATION_PROGRESS:
                 notification = new Notification();
                 break;
             case NOTIFICATION_PROGRESS:
                 notification = new Notification();


@@ -139,7 +140,7 @@ public class OCNotificationManager {
                                                               false);
                 return true;
             case NOTIFICATION_SIMPLE:
                                                               false);
                 return true;
             case NOTIFICATION_SIMPLE:

-                pair.mNotificaiton = new Notification(R.drawable.icon,
+                pair.mNotificaiton = new Notification(DisplayUtils.getSeasonalIconId(),

                                                       data.getText(), System.currentTimeMillis());
                 mNM.notify(notification_id, pair.mNotificaiton);
                 return true;
                                                       data.getText(), System.currentTimeMillis());
                 mNM.notify(notification_id, pair.mNotificaiton);
                 return true;