Allow Device Management Role Holder to update Settings strings.
Test: manual Bug: 188414370 Change-Id: I6e1a06619799a9e99382d791e72e2e4518f93cac
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.password;
|
||||
|
||||
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PATTERN_HEADER;
|
||||
import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;
|
||||
|
||||
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL;
|
||||
@@ -23,6 +24,7 @@ import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_U
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
@@ -474,15 +476,18 @@ public class ChooseLockPattern extends SettingsActivity {
|
||||
}
|
||||
|
||||
private void updateActivityTitle() {
|
||||
final int msg;
|
||||
final String msg;
|
||||
if (mForFingerprint) {
|
||||
msg = R.string.lockpassword_choose_your_pattern_header_for_fingerprint;
|
||||
msg = getString(R.string.lockpassword_choose_your_pattern_header_for_fingerprint);
|
||||
} else if (mForFace) {
|
||||
msg = R.string.lockpassword_choose_your_pattern_header_for_face;
|
||||
msg = getString(R.string.lockpassword_choose_your_pattern_header_for_face);
|
||||
} else if (mIsManagedProfile) {
|
||||
msg = getContext().getSystemService(DevicePolicyManager.class)
|
||||
.getString(SET_WORK_PROFILE_PATTERN_HEADER,
|
||||
() -> getString(
|
||||
R.string.lockpassword_choose_your_profile_pattern_header));
|
||||
} else {
|
||||
msg = mIsManagedProfile
|
||||
? R.string.lockpassword_choose_your_profile_pattern_header
|
||||
: R.string.lockpassword_choose_your_pattern_header;
|
||||
msg = getString(R.string.lockpassword_choose_your_pattern_header);
|
||||
}
|
||||
getActivity().setTitle(msg);
|
||||
}
|
||||
|
Reference in New Issue
Block a user