diff --git a/res/values/strings.xml b/res/values/strings.xml
index d752338bc40..6ee39708d6d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1446,6 +1446,12 @@
Lock
Hide
+
+ Confirm your private space pattern
+
+ Re-enter your private space PIN
+
+ Re-enter your private space password
You can add up to %d fingerprints
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index ead79d74d71..2665c373486 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -39,6 +39,7 @@ import android.os.CountDownTimer;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
+import android.os.UserHandle;
import android.os.UserManager;
import android.text.Editable;
import android.text.InputType;
@@ -65,6 +66,7 @@ import com.android.internal.widget.LockscreenCredential;
import com.android.internal.widget.TextViewInputDisabler;
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.Utils;
import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -290,6 +292,14 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
CONFIRM_WORK_PROFILE_PIN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pin_header));
}
+ if (android.multiuser.Flags.showCustomUnlockTitleInsidePrivateProfile()
+ && Utils.isPrivateProfile(mEffectiveUserId, getActivity())
+ && !UserManager.get(getActivity())
+ .isQuietModeEnabled(UserHandle.of(mEffectiveUserId))) {
+ return mIsAlpha ? getString(R.string.private_space_confirm_your_password_header)
+ : getString(R.string.private_space_confirm_your_pin_header);
+ }
+
return mIsAlpha ? getString(R.string.lockpassword_confirm_your_password_header)
: getString(R.string.lockpassword_confirm_your_pin_header);
}
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 28d790e1912..784e89884b8 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -34,6 +34,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.SystemClock;
+import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
import android.util.Log;
@@ -55,6 +56,7 @@ import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockscreenCredential;
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.Utils;
import com.android.settingslib.animation.AppearAnimationCreator;
import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -422,6 +424,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
CONFIRM_WORK_PROFILE_PATTERN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pattern_header));
}
+ if (android.multiuser.Flags.showCustomUnlockTitleInsidePrivateProfile()
+ && Utils.isPrivateProfile(mEffectiveUserId, getActivity())
+ && !UserManager.get(getActivity())
+ .isQuietModeEnabled(UserHandle.of(mEffectiveUserId))) {
+ return getString(R.string.private_space_confirm_your_pattern_header);
+ }
return getString(R.string.lockpassword_confirm_your_pattern_header);
}