diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 23:26:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 23:26:50 +0000 |
| commit | 43a0464518855ef8198301b2c2a46e362a937439 (patch) | |
| tree | 262065ca7f41d1ecf885bf09b6fe50a1426e4be0 | |
| parent | e88f413750b91e3829f64be07d7d0807c3a6bf2f (diff) | |
| parent | 9f14ffefd5a51f0abc7c40d703fb60656cf09b95 (diff) | |
| download | base-43a0464518855ef8198301b2c2a46e362a937439.tar.gz | |
Merge cherrypicks of [2783915, 2783051, 2783955, 2783916] into oc-dr1-release
Change-Id: I5e9cafeade136c4ea33540b2ee14f463d20686c7
| -rw-r--r-- | core/java/com/android/internal/notification/SystemNotificationChannels.java | 6 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/core/java/com/android/internal/notification/SystemNotificationChannels.java b/core/java/com/android/internal/notification/SystemNotificationChannels.java index d327180c6e9d..d64c9a1d813b 100644 --- a/core/java/com/android/internal/notification/SystemNotificationChannels.java +++ b/core/java/com/android/internal/notification/SystemNotificationChannels.java @@ -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); } diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c738637634be..61d2108780d2 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -641,17 +641,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] --> |