diff options
| author | Christian S <christian@pix-art.de> | 2016-04-14 20:44:59 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-14 20:44:59 +0200 |
| commit | 00f9ca537cd3f8095b664427b52a8989008a2dfe (patch) | |
| tree | 83d99c75e62dff4ac08aea1f67b7f0f196800d23 /src/main/java/eu/siacs/conversations/services/NotificationService.java | |
| parent | 955e56561dd7293d985d84270056ebd8adfe2a91 (diff) | |
| parent | 39e717ed94de2800df587395ba77310660c2ea5c (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/NotificationService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 7eef10f8f..83e59faa0 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -544,6 +544,11 @@ public class NotificationService { cancelIcon = R.drawable.ic_action_cancel; } mBuilder.setSmallIcon(R.drawable.ic_link_white_24dp); + if (Config.SHOW_DISABLE_FOREGROUND) { + mBuilder.addAction(cancelIcon, + mXmppConnectionService.getString(R.string.disable_foreground_service), + createDisableForeground()); + } return mBuilder.build(); } |