Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5087754b authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Show custom unlock title for private profile" into main

parents 539bae8d 6a333a2a

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1446,6 +1446,12 @@ 
    <string name="private_space_category_lock">Lock</string>

    <!-- The title of the category for settings related to hiding the private space  [CHAR LIMIT=20] -->

    <string name="private_space_category_hide">Hide</string>

    <!-- Header on pattern confirm screen inside private space settings when separate lock set for private space [CHAR LIMIT=50] -->

    <string name="private_space_confirm_your_pattern_header">Confirm your private space pattern</string>

     <!-- Header on PIN confirm screen inside private space settings when separate lock set for private space [CHAR LIMIT=50] -->

    <string name="private_space_confirm_your_pin_header">Re-enter your private space PIN</string>

     <!-- Header on password confirm screen inside private space when separate lock set for private space[CHAR LIMIT=50] -->

    <string name="private_space_confirm_your_password_header">Re-enter your private space password</string>









    <!-- Text shown when "Add fingerprint" button is disabled -->









    <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>

























src/com/android/settings/password/ConfirmLockPassword.java



+10
−0






























Original line number
Diff line number
Diff line







@@ -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);









        }
































src/com/android/settings/password/ConfirmLockPattern.java



+8
−0






























Original line number
Diff line number
Diff line







@@ -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);









        }