diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml
index 708b4f352112e..98fece3b3c6c2 100644
--- a/core/res/res/values-night/colors.xml
+++ b/core/res/res/values-night/colors.xml
@@ -35,4 +35,6 @@
#FFFFFF
#FFFFFF
+
+ #8AB4F8
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 77ac6db65bee2..c413f8b036d77 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -231,5 +231,8 @@
#FF202124
#FF5F6368
+
+ #1A73E8
+
#F9AB00
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index cf44e9bd06158..9ffa914e97981 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1203,6 +1203,7 @@
+
@@ -4007,6 +4008,8 @@
+
+
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 966694ad346c0..e44f862323150 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -16150,18 +16150,24 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
? R.string.personal_apps_suspension_tomorrow_text
: R.string.personal_apps_suspension_text);
final boolean ongoing = notificationState == PROFILE_OFF_DEADLINE_REACHED;
+ final int color = mContext.getColor(R.color.personal_apps_suspension_notification_color);
+ final Bundle extras = new Bundle();
+ // TODO: Create a separate string for this.
+ extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,
+ mContext.getString(R.string.notification_work_profile_content_description));
final Notification notification =
new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)
- .setSmallIcon(android.R.drawable.stat_sys_warning)
+ .setSmallIcon(R.drawable.ic_corp_badge_no_background)
.setOngoing(ongoing)
.setAutoCancel(false)
.setContentTitle(mContext.getString(
R.string.personal_apps_suspension_title))
.setContentText(text)
.setStyle(new Notification.BigTextStyle().bigText(text))
- .setColor(mContext.getColor(R.color.system_notification_accent_color))
+ .setColor(color)
.addAction(turnProfileOnButton)
+ .addExtras(extras)
.build();
mInjector.getNotificationManager().notify(
SystemMessage.NOTE_PERSONAL_APPS_SUSPENDED, notification);