Commit ed06ace1 authored by MozLando's avatar MozLando
Browse files

Merge #4684 



4684: Closes #4679 - lower download notification importance for Android O+ r=pocmo a=pt2121



Co-authored-by: default avatarprat t <banqfirn@gmail.com>
parents ca7ef551 d85858fd

components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadNotification.kt

+8 −2
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ import kotlin.random.Random 
@Suppress("TooManyFunctions")

internal object DownloadNotification {



    private const val NOTIFICATION_CHANNEL_ID = "Downloads"

    private const val NOTIFICATION_CHANNEL_ID = "mozac.feature.downloads.generic"

    private const val LEGACY_NOTIFICATION_CHANNEL_ID = "Downloads"



    internal const val EXTRA_DOWNLOAD_ID = "downloadId"
@@ -49,6 +50,7 @@ internal object DownloadNotification { 
            .setOngoing(true)

            .addAction(getPauseAction(context, downloadState.id))

            .addAction(getCancelAction(context, downloadState.id))

            .setPriority(NotificationCompat.PRIORITY_LOW)

            .build()

    }
@@ -82,6 +84,7 @@ internal object DownloadNotification { 
            .setContentText(context.getString(R.string.mozac_feature_downloads_completed_notification_text2))

            .setColor(ContextCompat.getColor(context, R.color.mozac_feature_downloads_notification))

            .setContentIntent(createPendingIntent(context, ACTION_OPEN, downloadState.id))

            .setPriority(NotificationCompat.PRIORITY_LOW)

            .build()

    }
@@ -99,6 +102,7 @@ internal object DownloadNotification { 
            .setCategory(NotificationCompat.CATEGORY_ERROR)

            .addAction(getTryAgainAction(context, downloadState.id))

            .addAction(getCancelAction(context, downloadState.id))

            .setPriority(NotificationCompat.PRIORITY_LOW)

            .build()

    }
@@ -133,10 +137,12 @@ internal object DownloadNotification { 
            val channel = NotificationChannel(

                NOTIFICATION_CHANNEL_ID,

                context.getString(R.string.mozac_feature_downloads_notification_channel),

                NotificationManager.IMPORTANCE_DEFAULT

                NotificationManager.IMPORTANCE_LOW

            )



            notificationManager.createNotificationChannel(channel)



            notificationManager.deleteNotificationChannel(LEGACY_NOTIFICATION_CHANNEL_ID)

        }



        return NOTIFICATION_CHANNEL_ID

docs/changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ permalink: /changelog/ 
    * To open .apk files, you must still add the permission `android.permission.INSTALL_PACKAGES` to your manifest.

  * Improved visuals of `SimpleDownloadDialogFragment` to better match `SitePermissionsDialogFragment`.

    * `SimpleDownloadDialogFragment` can similarly be themed by using `PromptsStyling` properties.

  * Recreated download notification channel with lower importance for Android O+ so that the notification is not audibly intrusive.



* **feature-webnotifications**

  * Adds feature implementation for configuring and displaying web notifications to the user