Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev

Browse Source
This commit is contained in:
Oli Thompson
2023-08-01 16:31:03 +00:00
committed by Android (Google) Code Review
parent b2c60799af 830a507382
commit 04854b1c65
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,12 +316,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
R.string.lockpassword_remote_validation_pattern_details);
}
final boolean isStrongAuthRequired = isStrongAuthRequired();
if (!mIsManagedProfile) {
return isStrongAuthRequired
? getString(R.string.lockpassword_strong_auth_required_device_pattern)
: getString(R.string.lockpassword_confirm_your_pattern_generic);
}
return null;
return isStrongAuthRequired
? getString(R.string.lockpassword_strong_auth_required_device_pattern)
: getString(R.string.lockpassword_confirm_your_pattern_generic);
}
private Object[][] getActiveViews() {
@@ -371,7 +368,10 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
CharSequence detailsText =
mDetailsText == null ? getDefaultDetails() : mDetailsText;
if (detailsText != null) {
if (mIsManagedProfile) {
mGlifLayout.getDescriptionTextView().setVisibility(View.GONE);
} else {
mGlifLayout.setDescriptionText(detailsText);
}