PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add special lock screen prompt strings for strong auth."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-11 12:04:38 +00:00
committed by Android (Google) Code Review
parent 1af7dc740f 4c96d9b203
commit 740405a044
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -54,16 +54,15 @@ import java.util.ArrayList;
public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
// The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.
// TODO(b/36511626): add back special strings for strong auth.
private static final int[] DETAIL_TEXTS = new int[] {
R.string.lockpassword_confirm_your_pin_generic,
R.string.lockpassword_confirm_your_password_generic,
R.string.lockpassword_confirm_your_pin_generic_profile,
R.string.lockpassword_confirm_your_password_generic_profile,
R.string.lockpassword_confirm_your_pin_generic,
R.string.lockpassword_confirm_your_password_generic,
R.string.lockpassword_confirm_your_pin_generic_profile,
R.string.lockpassword_confirm_your_password_generic_profile,
R.string.lockpassword_strong_auth_required_device_pin,
R.string.lockpassword_strong_auth_required_device_password,
R.string.lockpassword_strong_auth_required_work_pin,
R.string.lockpassword_strong_auth_required_work_password,
};
public static class InternalActivity extends ConfirmLockPassword {

10
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -243,11 +243,15 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
}
private int getDefaultDetails() {
// TODO(b/36511626): add back special strings for strong auth.
final boolean isStrongAuthRequired = isStrongAuthRequired();
if (UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId)) {
return R.string.lockpassword_confirm_your_pattern_generic_profile;
return isStrongAuthRequired
? R.string.lockpassword_strong_auth_required_work_pattern
: R.string.lockpassword_confirm_your_pattern_generic_profile;
} else {
return R.string.lockpassword_confirm_your_pattern_generic;
return isStrongAuthRequired
? R.string.lockpassword_strong_auth_required_device_pattern
: R.string.lockpassword_confirm_your_pattern_generic;
}
}