Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4796cf6b43

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f
This commit is contained in:
Julia Reynolds
2017-08-17 23:20:57 +00:00
committed by android-build-merger
parent 621a7ef452 4796cf6b43
commit 30e9c9c973
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/notification/SystemNotificationChannels.java
View File

@@ -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);
}

13
core/res/res/values/strings.xml
View File

@@ -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] -->