diff --git a/res/values/strings.xml b/res/values/strings.xml
index f12824780df..a3fad231f0a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1044,6 +1044,10 @@
For added security, set a PIN, pattern, or password for this device.
Set screen lock
+
+ Device has no screen lock
+
+ For added security, set a PIN, pattern, or password for this device.
diff --git a/src/com/android/settings/safetycenter/LockScreenSafetySource.java b/src/com/android/settings/safetycenter/LockScreenSafetySource.java
index bdc0a0918a6..ed3ebc004f5 100644
--- a/src/com/android/settings/safetycenter/LockScreenSafetySource.java
+++ b/src/com/android/settings/safetycenter/LockScreenSafetySource.java
@@ -138,6 +138,12 @@ public final class LockScreenSafetySource {
SET_SCREEN_LOCK_ACTION_ID,
context.getString(R.string.no_screen_lock_issue_action_label),
pendingIntent).build();
+ // Custom notification deliberately has zero actions
+ final SafetySourceIssue.Notification customNotification =
+ new SafetySourceIssue.Notification.Builder(
+ context.getString(R.string.no_screen_lock_issue_notification_title),
+ context.getString(R.string.no_screen_lock_issue_notification_text))
+ .build();
return new SafetySourceIssue.Builder(
NO_SCREEN_LOCK_ISSUE_ID,
context.getString(R.string.no_screen_lock_issue_title),
@@ -145,6 +151,10 @@ public final class LockScreenSafetySource {
SafetySourceData.SEVERITY_LEVEL_RECOMMENDATION,
NO_SCREEN_LOCK_ISSUE_TYPE_ID)
.setIssueCategory(SafetySourceIssue.ISSUE_CATEGORY_DEVICE)
- .addAction(action).build();
+ .addAction(action)
+ .setIssueActionability(SafetySourceIssue.ISSUE_ACTIONABILITY_MANUAL)
+ .setCustomNotification(customNotification)
+ .setNotificationBehavior(SafetySourceIssue.NOTIFICATION_BEHAVIOR_DELAYED)
+ .build();
}
}