From 6a3bd88078a17a64b151edc7f5b5de84f3d33ac9 Mon Sep 17 00:00:00 2001
From: josephpv <josephpv@google.com>
Date: Mon, 18 Mar 2024 22:34:02 +0000
Subject: [PATCH] Add message in dialog shown on choosing separate private
 space lock

Change to add message in the dialog shown on selecting to choose a new
profile lock for private space.

screenshot : go/ss/ASkBCFJuCzp7dkf.png

Bug: 330218365
Test: Manual. Diaog shown as per UX mock
Change-Id: I17f4d7ebf515dc7c95fcae7a5ec5edeb9918ded3
---
 res/values/strings.xml                                        | 4 +++-
 .../privatespace/onelock/UseOneLockControllerSwitch.java      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 54e7b2c5b22..de733b8262f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1236,8 +1236,10 @@
     <string name="private_space_category_ways_to_unlock">Ways to unlock</string>
     <!-- Summary for one lock when device screen lock is used as private profile lock. [CHAR LIMIT=40] -->
     <string name="private_space_screen_lock_summary">Same as device screen lock</string>
-    <!-- Dialog message to choose a new lock for Private Space. [CHAR LIMIT=50] -->
+    <!-- Dialog title to choose a new lock for Private Space. [CHAR LIMIT=50] -->
     <string name="private_space_new_lock_title">Choose a new lock for private space?</string>
+    <!-- Dialog message mentioning device PIN, pattern or password needs to be entered on the next screen. [CHAR LIMIT=NONE] -->
+    <string name="private_space_new_lock_message">You\’ll need to enter your device PIN, pattern, or password on the next screen</string>
     <!-- Title for the preference for auto lock private space and auto lock private space settings page. [CHAR LIMIT=50] -->
     <string name="private_space_auto_lock_title">Lock private space automatically</string>
     <!-- Description for private space auto lock settings page. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
index 680f5c7de0e..dfac100a522 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
@@ -192,7 +192,8 @@ public class UseOneLockControllerSwitch extends AbstractPreferenceController
             return;
         }
         new AlertDialog.Builder(mContext)
-                  .setMessage(R.string.private_space_new_lock_title)
+                  .setTitle(R.string.private_space_new_lock_title)
+                  .setMessage(R.string.private_space_new_lock_message)
                   .setPositiveButton(
                             R.string.private_space_set_lock_label,
                             (dialog, which) -> {