Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 433d3ab9 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5 am: 4796cf6b 

am: 30e9c9c9

Change-Id: I02a3ace673e19f738450112a9c06b1483fa648a4
parents 6819981c 30e9c9c9

core/java/com/android/internal/notification/SystemNotificationChannels.java

+4 −2
Original line number Diff line number Diff line
@@ -132,10 +132,12 @@ public class SystemNotificationChannels { 
                context.getString(R.string.notification_channel_usb),

                NotificationManager.IMPORTANCE_MIN));



        channelsList.add(new NotificationChannel(

        NotificationChannel foregroundChannel = new NotificationChannel(

                FOREGROUND_SERVICE,

                context.getString(R.string.notification_channel_foreground_service),

                NotificationManager.IMPORTANCE_LOW));

                NotificationManager.IMPORTANCE_LOW);

        foregroundChannel.setBlockableSystem(true);

        channelsList.add(foregroundChannel);



        nm.createNotificationChannels(channelsList);

    }

core/res/res/values/strings.xml

+7 −6
Original line number Diff line number Diff line
@@ -593,17 +593,18 @@ 
    <!-- This is the label for the notification channel settings that controls the behavior

        of the notification about applications that are running in the background (that is,

        perhaps confusingly, running foreground services but not the foreground UI on the screen).

        [CHAR LIMIT=NONE] -->

    <string name="notification_channel_foreground_service">Apps running in background</string>

        [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=6665375982962336520] -->

    <string name="notification_channel_foreground_service">Apps consuming battery</string>



    <!-- Label for foreground service notification when one app is running. [CHAR LIMIT=NONE] -->

    <!-- Label for foreground service notification when one app is running.

    [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=6826789589341671842] -->

    <string name="foreground_service_app_in_background"><xliff:g id="app_name">%1$s</xliff:g> is

        running in the background</string>

        using battery</string>



    <!-- Label for foreground service notification when multiple apps are running.

        [CHAR LIMIT=NONE] -->

        [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=7150914856893450380] -->

    <string name="foreground_service_apps_in_background"><xliff:g id="number">%1$d</xliff:g> apps

        are running in the background</string>

        are using battery</string>



    <!-- Content for foreground service notification when one app is running.

        [CHAR LIMIT=NONE] -->