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

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

Browse Source 
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
This commit is contained in:
kholoud mohamed
2022-03-14 11:11:33 +00:00
parent 45436a025c
commit de78149c16
49 changed files with 160 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/MainClear.java
View File

@@ -500,10 +500,10 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
context.getSystemService(DevicePolicyManager.class); context.getSystemService(DevicePolicyManager.class);
if (userInfo.isManagedProfile()) { if (userInfo.isManagedProfile()) {
titleText.setText(devicePolicyManager.getString( titleText.setText(devicePolicyManager.getResources().getString(
WORK_CATEGORY_HEADER, () -> getString(R.string.category_work))); WORK_CATEGORY_HEADER, () -> getString(R.string.category_work)));
} else { } else {
titleText.setText(devicePolicyManager.getString( titleText.setText(devicePolicyManager.getResources().getString(
PERSONAL_CATEGORY_HEADER, () -> getString(R.string.category_personal))); PERSONAL_CATEGORY_HEADER, () -> getString(R.string.category_personal)));
} }
contents.addView(titleView); contents.addView(titleView);

7
src/com/android/settings/RemoteBugreportActivity.java
View File

@@ -54,7 +54,7 @@ public class RemoteBugreportActivity extends Activity {
if (notificationType == DevicePolicyManager.NOTIFICATION_BUGREPORT_ACCEPTED_NOT_FINISHED) { if (notificationType == DevicePolicyManager.NOTIFICATION_BUGREPORT_ACCEPTED_NOT_FINISHED) {
AlertDialog dialog = new AlertDialog.Builder(this) AlertDialog dialog = new AlertDialog.Builder(this)
.setMessage(devicePolicyManager.getString( .setMessage(devicePolicyManager.getResources().getString(
SHARING_REMOTE_BUGREPORT_MESSAGE, SHARING_REMOTE_BUGREPORT_MESSAGE,
() -> getString(R.string.sharing_remote_bugreport_dialog_message))) () -> getString(R.string.sharing_remote_bugreport_dialog_message)))
.setOnDismissListener(new DialogInterface.OnDismissListener() { .setOnDismissListener(new DialogInterface.OnDismissListener() {
@@ -85,9 +85,10 @@ public class RemoteBugreportActivity extends Activity {
: SHARE_REMOTE_BUGREPORT_FINISHED_REQUEST_CONSENT; : SHARE_REMOTE_BUGREPORT_FINISHED_REQUEST_CONSENT;
AlertDialog dialog = new AlertDialog.Builder(this) AlertDialog dialog = new AlertDialog.Builder(this)
.setTitle(devicePolicyManager.getString(SHARE_REMOTE_BUGREPORT_DIALOG_TITLE, .setTitle(devicePolicyManager.getResources().getString(
SHARE_REMOTE_BUGREPORT_DIALOG_TITLE,
() -> getString(R.string.share_remote_bugreport_dialog_title))) () -> getString(R.string.share_remote_bugreport_dialog_title)))
.setMessage(devicePolicyManager.getString(overrideMessageId, .setMessage(devicePolicyManager.getResources().getString(overrideMessageId,
() -> getString(defaultMessageId))) () -> getString(defaultMessageId)))
.setOnDismissListener(new DialogInterface.OnDismissListener() { .setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override @Override

5
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -389,10 +389,11 @@ public class TrustedCredentialsSettings extends InstrumentedFragment
final TextView title = (TextView) convertView.findViewById(android.R.id.title); final TextView title = (TextView) convertView.findViewById(android.R.id.title);
if (getUserInfoByGroup(groupPosition).isManagedProfile()) { if (getUserInfoByGroup(groupPosition).isManagedProfile()) {
title.setText(mDevicePolicyManager.getString(WORK_CATEGORY_HEADER, title.setText(mDevicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER,
() -> getString(R.string.category_work))); () -> getString(R.string.category_work)));
} else { } else {
title.setText(mDevicePolicyManager.getString(PERSONAL_CATEGORY_HEADER, title.setText(mDevicePolicyManager.getResources().getString(
PERSONAL_CATEGORY_HEADER,
() -> getString(R.string.category_personal))); () -> getString(R.string.category_personal)));
} }

22
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -199,7 +199,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
UserHandle.myUserId())) { UserHandle.myUserId())) {
final SearchIndexableRaw data = new SearchIndexableRaw(mContext); final SearchIndexableRaw data = new SearchIndexableRaw(mContext);
data.key = PREF_KEY_REMOVE_PROFILE; data.key = PREF_KEY_REMOVE_PROFILE;
data.title = mDpm.getString( data.title = mDpm.getResources().getString(
REMOVE_WORK_PROFILE, REMOVE_WORK_PROFILE,
() -> res.getString(R.string.remove_managed_profile_label)); () -> res.getString(R.string.remove_managed_profile_label));
data.screenTitle = screenTitle; data.screenTitle = screenTitle;
@@ -207,7 +207,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
} }
final SearchIndexableRaw data = new SearchIndexableRaw(mContext); final SearchIndexableRaw data = new SearchIndexableRaw(mContext);
data.key = PREF_KEY_WORK_PROFILE_SETTING; data.key = PREF_KEY_WORK_PROFILE_SETTING;
data.title = mDpm.getString(MANAGED_PROFILE_SETTINGS_TITLE, data.title = mDpm.getResources().getString(MANAGED_PROFILE_SETTINGS_TITLE,
() -> res.getString(R.string.managed_profile_settings_title)); () -> res.getString(R.string.managed_profile_settings_title));
data.screenTitle = screenTitle; data.screenTitle = screenTitle;
rawData.add(data); rawData.add(data);
@@ -267,7 +267,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setSourceMetricsCategory(metricsCategory) .setSourceMetricsCategory(metricsCategory)
.setDestination(ManagedProfileSettings.class.getName()) .setDestination(ManagedProfileSettings.class.getName())
.setTitleText(mDpm.getString(MANAGED_PROFILE_SETTINGS_TITLE, .setTitleText(mDpm.getResources().getString(MANAGED_PROFILE_SETTINGS_TITLE,
() -> mContext.getString(R.string.managed_profile_settings_title))) () -> mContext.getString(R.string.managed_profile_settings_title)))
.setArguments(arguments) .setArguments(arguments)
.launch(); .launch();
@@ -347,12 +347,12 @@ public class AccountPreferenceController extends AbstractPreferenceController
} else if (userInfo.isManagedProfile()) { } else if (userInfo.isManagedProfile()) {
if (mType == ProfileSelectFragment.ProfileType.ALL) { if (mType == ProfileSelectFragment.ProfileType.ALL) {
preferenceGroup.setTitle( preferenceGroup.setTitle(
mDpm.getString(WORK_CATEGORY_HEADER, mDpm.getResources().getString(WORK_CATEGORY_HEADER,
() -> mContext.getString(R.string.category_work))); () -> mContext.getString(R.string.category_work)));
final String workGroupSummary = getWorkGroupSummary(context, userInfo); final String workGroupSummary = getWorkGroupSummary(context, userInfo);
preferenceGroup.setSummary(workGroupSummary); preferenceGroup.setSummary(workGroupSummary);
preferenceGroup.setContentDescription( preferenceGroup.setContentDescription(
mDpm.getString(ACCESSIBILITY_CATEGORY_WORK, () -> mDpm.getResources().getString(ACCESSIBILITY_CATEGORY_WORK, () ->
mContext.getString( mContext.getString(
R.string.accessibility_category_work, workGroupSummary))); R.string.accessibility_category_work, workGroupSummary)));
} }
@@ -363,10 +363,10 @@ public class AccountPreferenceController extends AbstractPreferenceController
} else { } else {
if (mType == ProfileSelectFragment.ProfileType.ALL) { if (mType == ProfileSelectFragment.ProfileType.ALL) {
preferenceGroup.setTitle( preferenceGroup.setTitle(
mDpm.getString(PERSONAL_CATEGORY_HEADER, mDpm.getResources().getString(PERSONAL_CATEGORY_HEADER,
() -> mContext.getString(R.string.category_personal))); () -> mContext.getString(R.string.category_personal)));
preferenceGroup.setContentDescription( preferenceGroup.setContentDescription(
mDpm.getString(ACCESSIBILITY_CATEGORY_PERSONAL, () -> mDpm.getResources().getString(ACCESSIBILITY_CATEGORY_PERSONAL, () ->
mContext.getString(R.string.accessibility_category_personal))); mContext.getString(R.string.accessibility_category_personal)));
} }
} }
@@ -401,7 +401,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
mFragment.getPreferenceManager().getContext()); mFragment.getPreferenceManager().getContext());
preference.setKey(PREF_KEY_REMOVE_PROFILE); preference.setKey(PREF_KEY_REMOVE_PROFILE);
preference.setTitle( preference.setTitle(
mDpm.getString(REMOVE_WORK_PROFILE, mDpm.getResources().getString(REMOVE_WORK_PROFILE,
() -> mContext.getString(R.string.remove_managed_profile_label))); () -> mContext.getString(R.string.remove_managed_profile_label)));
preference.setIcon(R.drawable.ic_delete); preference.setIcon(R.drawable.ic_delete);
preference.setOnPreferenceClickListener(this); preference.setOnPreferenceClickListener(this);
@@ -413,7 +413,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
private Preference newManagedProfileSettings() { private Preference newManagedProfileSettings() {
Preference preference = new Preference(mFragment.getPreferenceManager().getContext()); Preference preference = new Preference(mFragment.getPreferenceManager().getContext());
preference.setKey(PREF_KEY_WORK_PROFILE_SETTING); preference.setKey(PREF_KEY_WORK_PROFILE_SETTING);
preference.setTitle(mDpm.getString(MANAGED_PROFILE_SETTINGS_TITLE, preference.setTitle(mDpm.getResources().getString(MANAGED_PROFILE_SETTINGS_TITLE,
() -> mContext.getString(R.string.managed_profile_settings_title))); () -> mContext.getString(R.string.managed_profile_settings_title)));
preference.setIcon(R.drawable.ic_settings_24dp); preference.setIcon(R.drawable.ic_settings_24dp);
preference.setOnPreferenceClickListener(this); preference.setOnPreferenceClickListener(this);
@@ -428,7 +428,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
return null; return null;
} }
CharSequence appLabel = packageManager.getApplicationLabel(adminApplicationInfo); CharSequence appLabel = packageManager.getApplicationLabel(adminApplicationInfo);
return mDpm.getString(MANAGED_BY, return mDpm.getResources().getString(MANAGED_BY,
() -> mContext.getString(R.string.managing_admin, appLabel), appLabel); () -> mContext.getString(R.string.managing_admin, appLabel), appLabel);
} }
@@ -508,7 +508,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon); mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);
mProfileNotAvailablePreference.setTitle(null); mProfileNotAvailablePreference.setTitle(null);
mProfileNotAvailablePreference.setSummary( mProfileNotAvailablePreference.setSummary(
mDpm.getString( mDpm.getResources().getString(
WORK_PROFILE_NOT_AVAILABLE, () -> mContext.getString( WORK_PROFILE_NOT_AVAILABLE, () -> mContext.getString(
R.string.managed_profile_not_available_label))); R.string.managed_profile_not_available_label)));
profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference); profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);

5
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -163,10 +163,11 @@ public class AccountSyncSettings extends AccountPreferenceBase {
String accessibilityTitle = String accessibilityTitle =
isWorkProfile isWorkProfile
? devicePolicyManager.getString(ACCESSIBILITY_WORK_ACCOUNT_TITLE, ? devicePolicyManager.getResources().getString(
ACCESSIBILITY_WORK_ACCOUNT_TITLE,
() -> getString(R.string.accessibility_work_account_title, () -> getString(R.string.accessibility_work_account_title,
currentTitle), currentTitle) currentTitle), currentTitle)
: devicePolicyManager.getString( : devicePolicyManager.getResources().getString(
ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE, ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE,
() -> getString( () -> getString(
R.string.accessibility_personal_account_title, R.string.accessibility_personal_account_title,

1
src/com/android/settings/accounts/RemoveAccountPreferenceController.java
View File

@@ -217,6 +217,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
return new AlertDialog.Builder(context) return new AlertDialog.Builder(context)
.setTitle(R.string.remove_account_label) .setTitle(R.string.remove_account_label)
.setMessage(getContext().getSystemService(DevicePolicyManager.class) .setMessage(getContext().getSystemService(DevicePolicyManager.class)
.getResources()
.getString(REMOVE_ACCOUNT_FAILED_ADMIN_RESTRICTION, .getString(REMOVE_ACCOUNT_FAILED_ADMIN_RESTRICTION,
() -> getString(R.string.remove_account_failed))) () -> getString(R.string.remove_account_failed)))
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)

10
src/com/android/settings/accounts/WorkModePreferenceController.java
View File

@@ -87,13 +87,13 @@ public class WorkModePreferenceController extends BasePreferenceController imple
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
if (isChecked()) { if (isChecked()) {
return mDevicePolicyManager return mDevicePolicyManager.getResources().getString(
.getString(WORK_PROFILE_SETTING_ON_SUMMARY, WORK_PROFILE_SETTING_ON_SUMMARY,
() -> mContext.getString(R.string.work_mode_on_summary)); () -> mContext.getString(R.string.work_mode_on_summary));
} }
return mDevicePolicyManager return mDevicePolicyManager.getResources().getString(
.getString(WORK_PROFILE_SETTING_OFF_SUMMARY, WORK_PROFILE_SETTING_OFF_SUMMARY,
() -> mContext.getString(R.string.work_mode_off_summary)); () -> mContext.getString(R.string.work_mode_off_summary));
} }

3
src/com/android/settings/applications/UsageAccessDetails.java
View File

@@ -97,7 +97,8 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
new AlertDialog.Builder(getContext()) new AlertDialog.Builder(getContext())
.setIcon(com.android.internal.R.drawable.ic_dialog_alert_material) .setIcon(com.android.internal.R.drawable.ic_dialog_alert_material)
.setTitle(android.R.string.dialog_alert_title) .setTitle(android.R.string.dialog_alert_title)
.setMessage(mDpm.getString(WORK_PROFILE_DISABLE_USAGE_ACCESS_WARNING, .setMessage(mDpm.getResources().getString(
WORK_PROFILE_DISABLE_USAGE_ACCESS_WARNING,
() -> getString(R.string.work_profile_usage_access_warning))) () -> getString(R.string.work_profile_usage_access_warning)))
.setPositiveButton(R.string.okay, null) .setPositiveButton(R.string.okay, null)
.show(); .show();

33
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -335,7 +335,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
// Build and show the simplified dialog // Build and show the simplified dialog
final Dialog dialog = new AlertDialog.Builder(this) final Dialog dialog = new AlertDialog.Builder(this)
.setTitle(mDPM.getString(SET_PROFILE_OWNER_DIALOG_TITLE, .setTitle(mDPM.getResources().getString(SET_PROFILE_OWNER_DIALOG_TITLE,
() -> getString(R.string.profile_owner_add_title_simplified))) () -> getString(R.string.profile_owner_add_title_simplified)))
.setView(R.layout.profile_owner_add) .setView(R.layout.profile_owner_add)
.setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() {
@@ -358,7 +358,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
mAddMsg.setText(mAddMsgText); mAddMsg.setText(mAddMsgText);
mAdminWarning = dialog.findViewById(R.id.admin_warning_simplified); mAdminWarning = dialog.findViewById(R.id.admin_warning_simplified);
mAdminWarning.setText( mAdminWarning.setText(
mDPM.getString(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, () -> mDPM.getResources().getString(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, () ->
getString(R.string.device_admin_warning_simplified, getString(R.string.device_admin_warning_simplified,
mProfileOwnerName), mProfileOwnerName)); mProfileOwnerName), mProfileOwnerName));
return; return;
@@ -371,7 +371,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
mProfileOwnerWarning = (TextView) findViewById(R.id.profile_owner_warning); mProfileOwnerWarning = (TextView) findViewById(R.id.profile_owner_warning);
mProfileOwnerWarning.setText( mProfileOwnerWarning.setText(
mDPM.getString(SET_PROFILE_OWNER_POSTSETUP_WARNING, mDPM.getResources().getString(SET_PROFILE_OWNER_POSTSETUP_WARNING,
() -> getString(R.string.adding_profile_owner_warning))); () -> getString(R.string.adding_profile_owner_warning)));
mAddMsg = (TextView)findViewById(R.id.add_msg); mAddMsg = (TextView)findViewById(R.id.add_msg);
@@ -419,7 +419,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
}); });
mUninstallButton = (Button) findViewById(R.id.uninstall_button); mUninstallButton = (Button) findViewById(R.id.uninstall_button);
mUninstallButton.setText(mDPM.getString(UNINSTALL_DEVICE_ADMIN, mUninstallButton.setText(mDPM.getResources().getString(UNINSTALL_DEVICE_ADMIN,
() -> getString(R.string.uninstall_device_admin))); () -> getString(R.string.uninstall_device_admin)));
mUninstallButton.setFilterTouchesWhenObscured(true); mUninstallButton.setFilterTouchesWhenObscured(true);
mUninstallButton.setOnClickListener(new View.OnClickListener() { mUninstallButton.setOnClickListener(new View.OnClickListener() {
@@ -681,9 +681,10 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
final boolean isManagedProfile = isManagedProfile(mDeviceAdmin); final boolean isManagedProfile = isManagedProfile(mDeviceAdmin);
if (isProfileOwner && isManagedProfile) { if (isProfileOwner && isManagedProfile) {
// Profile owner in a managed profile, user can remove profile to disable admin. // Profile owner in a managed profile, user can remove profile to disable admin.
mAdminWarning.setText(mDPM.getString(WORK_PROFILE_ADMIN_POLICIES_WARNING, mAdminWarning.setText(mDPM.getResources().getString(
WORK_PROFILE_ADMIN_POLICIES_WARNING,
() -> getString(R.string.admin_profile_owner_message))); () -> getString(R.string.admin_profile_owner_message)));
mActionButton.setText(mDPM.getString(REMOVE_WORK_PROFILE, mActionButton.setText(mDPM.getResources().getString(REMOVE_WORK_PROFILE,
() -> getString(R.string.remove_managed_profile_label))); () -> getString(R.string.remove_managed_profile_label)));
final EnforcedAdmin admin = getAdminEnforcingCantRemoveProfile(); final EnforcedAdmin admin = getAdminEnforcingCantRemoveProfile();
@@ -698,32 +699,34 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
// Profile owner in a user or device owner, user can't disable admin. // Profile owner in a user or device owner, user can't disable admin.
if (isProfileOwner) { if (isProfileOwner) {
// Show profile owner in a user description. // Show profile owner in a user description.
mAdminWarning.setText(mDPM.getString(USER_ADMIN_POLICIES_WARNING, mAdminWarning.setText(mDPM.getResources().getString(USER_ADMIN_POLICIES_WARNING,
() -> getString(R.string.admin_profile_owner_user_message))); () -> getString(R.string.admin_profile_owner_user_message)));
} else { } else {
// Show device owner description. // Show device owner description.
if (isFinancedDevice()) { if (isFinancedDevice()) {
mAdminWarning.setText(R.string.admin_financed_message); mAdminWarning.setText(R.string.admin_financed_message);
} else { } else {
mAdminWarning.setText(mDPM.getString(DEVICE_ADMIN_POLICIES_WARNING, mAdminWarning.setText(mDPM.getResources().getString(
DEVICE_ADMIN_POLICIES_WARNING,
() -> getString(R.string.admin_device_owner_message))); () -> getString(R.string.admin_device_owner_message)));
} }
} }
mActionButton.setText(mDPM.getString(REMOVE_DEVICE_ADMIN, mActionButton.setText(mDPM.getResources().getString(REMOVE_DEVICE_ADMIN,
() -> getString(R.string.remove_device_admin))); () -> getString(R.string.remove_device_admin)));
mActionButton.setEnabled(false); mActionButton.setEnabled(false);
} else { } else {
addDeviceAdminPolicies(false /* showDescription */); addDeviceAdminPolicies(false /* showDescription */);
CharSequence label = mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel( CharSequence label = mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(
getPackageManager()); getPackageManager());
mAdminWarning.setText(mDPM.getString(ACTIVE_DEVICE_ADMIN_WARNING, mAdminWarning.setText(mDPM.getResources().getString(ACTIVE_DEVICE_ADMIN_WARNING,
() -> getString(R.string.device_admin_status, label), label)); () -> getString(R.string.device_admin_status, label), label));
setTitle(R.string.active_device_admin_msg); setTitle(R.string.active_device_admin_msg);
if (mUninstalling) { if (mUninstalling) {
mActionButton.setText(mDPM.getString(REMOVE_AND_UNINSTALL_DEVICE_ADMIN, mActionButton.setText(mDPM.getResources().getString(
REMOVE_AND_UNINSTALL_DEVICE_ADMIN,
() -> getString(R.string.remove_and_uninstall_device_admin))); () -> getString(R.string.remove_and_uninstall_device_admin)));
} else { } else {
mActionButton.setText(mDPM.getString(REMOVE_DEVICE_ADMIN, mActionButton.setText(mDPM.getResources().getString(REMOVE_DEVICE_ADMIN,
() -> getString(R.string.remove_device_admin))); () -> getString(R.string.remove_device_admin)));
} }
} }
@@ -740,12 +743,12 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
CharSequence label = mDeviceAdmin.getActivityInfo() CharSequence label = mDeviceAdmin.getActivityInfo()
.applicationInfo.loadLabel(getPackageManager()); .applicationInfo.loadLabel(getPackageManager());
mAdminWarning.setText( mAdminWarning.setText(
mDPM.getString(NEW_DEVICE_ADMIN_WARNING, () -> mDPM.getResources().getString(NEW_DEVICE_ADMIN_WARNING, () ->
getString(R.string.device_admin_warning, label getString(R.string.device_admin_warning, label
), label)); ), label));
setTitle(mDPM.getString(ACTIVATE_DEVICE_ADMIN_APP, setTitle(mDPM.getResources().getString(ACTIVATE_DEVICE_ADMIN_APP,
() -> getString(R.string.add_device_admin_msg))); () -> getString(R.string.add_device_admin_msg)));
mActionButton.setText(mDPM.getString(ACTIVATE_THIS_DEVICE_ADMIN_APP, mActionButton.setText(mDPM.getResources().getString(ACTIVATE_THIS_DEVICE_ADMIN_APP,
() -> getString(R.string.add_device_admin))); () -> getString(R.string.add_device_admin)));
if (isAdminUninstallable()) { if (isAdminUninstallable()) {
mUninstallButton.setVisibility(View.VISIBLE); mUninstallButton.setVisibility(View.VISIBLE);

15
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -156,7 +156,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
} }
preference.setSummary( preference.setSummary(
mDevicePolicyManager.getString(overrideKey, mDevicePolicyManager.getResources().getString(overrideKey,
() -> getString(resource))); () -> getString(resource)));
} }
@@ -296,19 +296,20 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
final TextView dialogTitle = dialogView.findViewById( final TextView dialogTitle = dialogView.findViewById(
R.id.interact_across_profiles_consent_dialog_title); R.id.interact_across_profiles_consent_dialog_title);
dialogTitle.setText(mDpm.getString(CONNECT_APPS_DIALOG_TITLE, () -> dialogTitle.setText(mDpm.getResources().getString(CONNECT_APPS_DIALOG_TITLE, () ->
getString(R.string.interact_across_profiles_consent_dialog_title, mAppLabel), getString(R.string.interact_across_profiles_consent_dialog_title, mAppLabel),
mAppLabel)); mAppLabel));
final TextView appDataSummary = dialogView.findViewById(R.id.app_data_summary); final TextView appDataSummary = dialogView.findViewById(R.id.app_data_summary);
appDataSummary.setText( appDataSummary.setText(
mDpm.getString(APP_CAN_ACCESS_PERSONAL_DATA, mDpm.getResources().getString(APP_CAN_ACCESS_PERSONAL_DATA,
() -> getString( () -> getString(
R.string.interact_across_profiles_consent_dialog_app_data_summary, R.string.interact_across_profiles_consent_dialog_app_data_summary,
mAppLabel), mAppLabel)); mAppLabel), mAppLabel));
final TextView permissionsSummary = dialogView.findViewById(R.id.permissions_summary); final TextView permissionsSummary = dialogView.findViewById(R.id.permissions_summary);
permissionsSummary.setText(mDpm.getString(APP_CAN_ACCESS_PERSONAL_PERMISSIONS, permissionsSummary.setText(mDpm.getResources().getString(
APP_CAN_ACCESS_PERSONAL_PERMISSIONS,
() -> getString( () -> getString(
R.string.interact_across_profiles_consent_dialog_permissions_summary, R.string.interact_across_profiles_consent_dialog_permissions_summary,
mAppLabel), mAppLabel),
@@ -316,7 +317,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
final TextView dialogSummary = final TextView dialogSummary =
dialogView.findViewById(R.id.interact_across_profiles_consent_dialog_summary); dialogView.findViewById(R.id.interact_across_profiles_consent_dialog_summary);
dialogSummary.setText(mDpm.getString(CONNECT_APPS_DIALOG_SUMMARY, dialogSummary.setText(mDpm.getResources().getString(CONNECT_APPS_DIALOG_SUMMARY,
() -> getString( () -> getString(
R.string.interact_across_profiles_consent_dialog_summary))); R.string.interact_across_profiles_consent_dialog_summary)));
@@ -445,7 +446,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
} }
if (!mInstalledInPersonal) { if (!mInstalledInPersonal) {
mInstallBanner.setTitle( mInstallBanner.setTitle(
mDpm.getString(INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT, mDpm.getResources().getString(INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT,
() -> getString( () -> getString(
R.string.interact_across_profiles_install_personal_app_title, R.string.interact_across_profiles_install_personal_app_title,
mAppLabel), mAppLabel),
@@ -459,7 +460,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
} }
if (!mInstalledInWork) { if (!mInstalledInWork) {
mInstallBanner.setTitle( mInstallBanner.setTitle(
mDpm.getString(INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT, mDpm.getResources().getString(INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT,
() -> getString( () -> getString(
R.string.interact_across_profiles_install_work_app_title, R.string.interact_across_profiles_install_work_app_title,
mAppLabel), mAppLabel),

3
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java
View File

@@ -95,7 +95,8 @@ public class InteractAcrossProfilesSettings extends EmptyTextSettings {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
AppInfoBase.startAppInfoFragment(InteractAcrossProfilesDetails.class, AppInfoBase.startAppInfoFragment(InteractAcrossProfilesDetails.class,
mDevicePolicyManager.getString(CONNECTED_WORK_AND_PERSONAL_APPS_TITLE, mDevicePolicyManager.getResources().getString(
CONNECTED_WORK_AND_PERSONAL_APPS_TITLE,
() -> getString(R.string.interact_across_profiles_title)), () -> getString(R.string.interact_across_profiles_title)),
packageName, packageName,
appInfo.uid, appInfo.uid,

2
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -225,7 +225,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
@Override @Override
protected String getDescriptionDisabledByAdmin() { protected String getDescriptionDisabledByAdmin() {
DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class); DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
return devicePolicyManager.getString( return devicePolicyManager.getResources().getString(
FACE_UNLOCK_DISABLED, FACE_UNLOCK_DISABLED,
() -> getString(R.string.security_settings_face_enroll_introduction_message_unlock_disabled)); () -> getString(R.string.security_settings_face_enroll_introduction_message_unlock_disabled));
} }

2
src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
View File

@@ -80,7 +80,7 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC
super.updateState(preference); super.updateState(preference);
preference.setTitle( preference.setTitle(
mDevicePolicyManager.getString(FACE_SETTINGS_FOR_WORK_TITLE, () -> mDevicePolicyManager.getResources().getString(FACE_SETTINGS_FOR_WORK_TITLE, () ->
mContext.getResources().getString( mContext.getResources().getString(
R.string.security_settings_face_profile_preference_title))); R.string.security_settings_face_profile_preference_title)));
} }

6
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -162,9 +162,9 @@ public class FaceSettings extends DashboardFragment {
if (mUserManager.getUserInfo(mUserId).isManagedProfile()) { if (mUserManager.getUserInfo(mUserId).isManagedProfile()) {
getActivity().setTitle( getActivity().setTitle(
mDevicePolicyManager.getString(FACE_SETTINGS_FOR_WORK_TITLE, () -> mDevicePolicyManager.getResources().getString(FACE_SETTINGS_FOR_WORK_TITLE,
getActivity().getResources().getString( () -> getActivity().getResources().getString(
R.string.security_settings_face_profile_preference_title))); R.string.security_settings_face_profile_preference_title)));
} }
mLockscreenController = Utils.isMultipleBiometricsSupported(context) mLockscreenController = Utils.isMultipleBiometricsSupported(context)

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -186,7 +186,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
@Override @Override
protected String getDescriptionDisabledByAdmin() { protected String getDescriptionDisabledByAdmin() {
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
FINGERPRINT_UNLOCK_DISABLED, FINGERPRINT_UNLOCK_DISABLED,
() -> getString(R.string.security_settings_fingerprint_enroll_introduction_message_unlock_disabled)); () -> getString(R.string.security_settings_fingerprint_enroll_introduction_message_unlock_disabled));
} }

12
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.biometrics.fingerprint;
import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_UNLOCK_DISABLED_EXPLANATION; import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_UNLOCK_DISABLED_EXPLANATION;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED; import static android.app.admin.DevicePolicyResources.UNDEFINED;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
@@ -366,7 +366,7 @@ public class FingerprintSettings extends SubSettings {
if (admin != null) { if (admin != null) {
DevicePolicyManager devicePolicyManager = DevicePolicyManager devicePolicyManager =
getSystemService(DevicePolicyManager.class); getSystemService(DevicePolicyManager.class);
String footerText = devicePolicyManager.getString( String footerText = devicePolicyManager.getResources().getString(
FINGERPRINT_UNLOCK_DISABLED_EXPLANATION, FINGERPRINT_UNLOCK_DISABLED_EXPLANATION,
() -> getString(R.string.security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled)); () -> getString(R.string.security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled));
@@ -457,10 +457,8 @@ public class FingerprintSettings extends SubSettings {
final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD); final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
/* Disable preference if too many fingerprints added */ /* Disable preference if too many fingerprints added */
final List<FingerprintSensorPropertiesInternal> props = final int max = getContext().getResources().getInteger(
mFingerprintManager.getSensorPropertiesInternal(); com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
// This will need to be updated for devices with multiple fingerprint sensors
final int max = props.get(0).maxEnrollmentsPerUser;
boolean tooMany = mFingerprintManager.getEnrolledFingerprints(mUserId).size() >= max; boolean tooMany = mFingerprintManager.getEnrolledFingerprints(mUserId).size() >= max;
// retryFingerprint() will be called when remove finishes // retryFingerprint() will be called when remove finishes
// need to disable enroll or have a way to determine if enroll is in progress // need to disable enroll or have a way to determine if enroll is in progress
@@ -948,7 +946,7 @@ public class FingerprintSettings extends SubSettings {
final AlertDialog alertDialog = new AlertDialog.Builder(getActivity()) final AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
.setTitle(R.string.fingerprint_last_delete_title) .setTitle(R.string.fingerprint_last_delete_title)
.setMessage(devicePolicyManager.getString( .setMessage(devicePolicyManager.getResources().getString(
messageId, () -> getContext().getString(defaultMessageId))) messageId, () -> getContext().getString(defaultMessageId)))
.setPositiveButton(R.string.fingerprint_last_delete_confirm, .setPositiveButton(R.string.fingerprint_last_delete_confirm,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {

4
src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
View File

@@ -196,10 +196,10 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
context.getSystemService(DevicePolicyManager.class); context.getSystemService(DevicePolicyManager.class);
if (userInfo != null && userInfo.isManagedProfile()) { if (userInfo != null && userInfo.isManagedProfile()) {
return devicePolicyManager.getString(WORK_PROFILE_APP_SUBTEXT, return devicePolicyManager.getResources().getString(WORK_PROFILE_APP_SUBTEXT,
() -> context.getString(R.string.work_profile_app_subtext)); () -> context.getString(R.string.work_profile_app_subtext));
} }
return devicePolicyManager.getString(PERSONAL_PROFILE_APP_SUBTEXT, return devicePolicyManager.getResources().getString(PERSONAL_PROFILE_APP_SUBTEXT,
() -> context.getString(R.string.personal_profile_app_subtext)); () -> context.getString(R.string.personal_profile_app_subtext));
} }

4
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -545,7 +545,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
} }
preference.setTitle( preference.setTitle(
mDevicePolicyManager.getString(overrideKey, mDevicePolicyManager.getResources().getString(overrideKey,
() -> getString(resource))); () -> getString(resource)));
} }
@@ -558,7 +558,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
} }
preference.setSummary( preference.setSummary(
mDevicePolicyManager.getString(overrideKey, mDevicePolicyManager.getResources().getString(overrideKey,
() -> getString(resource))); () -> getString(resource)));
} }
} }

4
src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
View File

@@ -189,11 +189,11 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
getContext().getSystemService(DevicePolicyManager.class); getContext().getSystemService(DevicePolicyManager.class);
if (position == WORK_TAB) { if (position == WORK_TAB) {
return devicePolicyManager.getString(WORK_CATEGORY_HEADER, return devicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER,
() -> getContext().getString(R.string.category_work)); () -> getContext().getString(R.string.category_work));
} }
return devicePolicyManager.getString(PERSONAL_CATEGORY_HEADER, return devicePolicyManager.getResources().getString(PERSONAL_CATEGORY_HEADER,
() -> getContext().getString(R.string.category_personal)); () -> getContext().getString(R.string.category_personal));
} }

10
src/com/android/settings/dashboard/profileselector/UserAdapter.java
View File

@@ -59,9 +59,9 @@ public class UserAdapter implements SpinnerAdapter, ListAdapter {
UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier()); UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
Drawable icon; Drawable icon;
if (userInfo.isManagedProfile()) { if (userInfo.isManagedProfile()) {
mName = context.getSystemService(DevicePolicyManager.class).getString( mName = context.getSystemService(DevicePolicyManager.class).getResources()
WORK_PROFILE_USER_LABEL, .getString(WORK_PROFILE_USER_LABEL,
() -> context.getString(R.string.managed_user_title)); () -> context.getString(R.string.managed_user_title));
icon = context.getPackageManager().getUserBadgeForDensityNoBackground( icon = context.getPackageManager().getUserBadgeForDensityNoBackground(
userHandle, /* density= */ 0); userHandle, /* density= */ 0);
} else { } else {
@@ -119,10 +119,10 @@ public class UserAdapter implements SpinnerAdapter, ListAdapter {
int userHandle = user.mUserHandle.getIdentifier(); int userHandle = user.mUserHandle.getIdentifier();
if (userHandle == UserHandle.USER_CURRENT if (userHandle == UserHandle.USER_CURRENT
|| userHandle == ActivityManager.getCurrentUser()) { || userHandle == ActivityManager.getCurrentUser()) {
return mDevicePolicyManager.getString(PERSONAL_CATEGORY_HEADER, return mDevicePolicyManager.getResources().getString(PERSONAL_CATEGORY_HEADER,
() -> mContext.getString(R.string.category_personal)); () -> mContext.getString(R.string.category_personal));
} else { } else {
return mDevicePolicyManager.getString(WORK_CATEGORY_HEADER, return mDevicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER,
() -> mContext.getString(R.string.category_work)); () -> mContext.getString(R.string.category_work));
} }
} }

2
src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
View File

@@ -89,7 +89,7 @@ public class StorageWizardMoveProgress extends StorageWizardBase {
case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE: case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
return getString(R.string.insufficient_storage); return getString(R.string.insufficient_storage);
case PackageManager.MOVE_FAILED_DEVICE_ADMIN: case PackageManager.MOVE_FAILED_DEVICE_ADMIN:
return getSystemService(DevicePolicyManager.class) return getSystemService(DevicePolicyManager.class).getResources()
.getString(ERROR_MOVE_DEVICE_ADMIN, .getString(ERROR_MOVE_DEVICE_ADMIN,
() -> getString(R.string.move_error_device_admin)); () -> getString(R.string.move_error_device_admin));
case PackageManager.MOVE_FAILED_DOESNT_EXIST: case PackageManager.MOVE_FAILED_DOESNT_EXIST:

1
src/com/android/settings/display/ScreenTimeoutPreferenceController.java
View File

@@ -62,6 +62,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
if (admin != null) { if (admin != null) {
preference.setEnabled(false); preference.setEnabled(false);
preference.setSummary(mContext.getSystemService(DevicePolicyManager.class) preference.setSummary(mContext.getSystemService(DevicePolicyManager.class)
.getResources()
.getString(DISABLED_BY_IT_ADMIN_TITLE, .getString(DISABLED_BY_IT_ADMIN_TITLE,
() -> mContext.getString(R.string.disabled_by_policy_title))); () -> mContext.getString(R.string.disabled_by_policy_title)));
((RestrictedPreference) preference).setDisabledByAdmin(admin); ((RestrictedPreference) preference).setDisabledByAdmin(admin);

2
src/com/android/settings/display/ScreenTimeoutSettings.java
View File

@@ -223,7 +223,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
@VisibleForTesting @VisibleForTesting
void setupDisabledFooterPreference() { void setupDisabledFooterPreference() {
final String textDisabledByAdmin = mDevicePolicyManager.getString( final String textDisabledByAdmin = mDevicePolicyManager.getResources().getString(
OTHER_OPTIONS_DISABLED_BY_ADMIN, () -> getResources().getString( OTHER_OPTIONS_DISABLED_BY_ADMIN, () -> getResources().getString(
R.string.admin_disabled_other_options)); R.string.admin_disabled_other_options));
final String textMoreDetails = getResources().getString(R.string.admin_more_details); final String textMoreDetails = getResources().getString(R.string.admin_more_details);

2
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -73,7 +73,7 @@ public final class ActionDisabledByAdminDialogHelper {
mActivity.getSystemService(DevicePolicyManager.class); mActivity.getSystemService(DevicePolicyManager.class);
TextView title = mDialogView.findViewById(R.id.admin_support_dialog_title); TextView title = mDialogView.findViewById(R.id.admin_support_dialog_title);
title.setText(devicePolicyManager.getString(DISABLED_BY_IT_ADMIN_TITLE, title.setText(devicePolicyManager.getResources().getString(DISABLED_BY_IT_ADMIN_TITLE,
() -> mActivity.getString(R.string.disabled_by_policy_title))); () -> mActivity.getString(R.string.disabled_by_policy_title)));
} }

2
src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
View File

@@ -52,7 +52,7 @@ public abstract class AdminActionPreferenceControllerBase extends
} }
private String getEnterprisePrivacyNone() { private String getEnterprisePrivacyNone() {
return mContext.getSystemService(DevicePolicyManager.class) return mContext.getSystemService(DevicePolicyManager.class).getResources()
.getString(ADMIN_ACTION_NONE, .getString(ADMIN_ACTION_NONE,
() -> mContext.getString(R.string.enterprise_privacy_none)); () -> mContext.getString(R.string.enterprise_privacy_none));
} }

4
src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
View File

@@ -44,13 +44,13 @@ public class AlwaysOnVpnCurrentUserPreferenceController
public void updateState(Preference preference) { public void updateState(Preference preference) {
if (mFeatureProvider.isInCompMode()) { if (mFeatureProvider.isInCompMode()) {
preference.setTitle( preference.setTitle(
mDevicePolicyManager.getString( mDevicePolicyManager.getResources().getString(
ALWAYS_ON_VPN_PERSONAL_PROFILE, ALWAYS_ON_VPN_PERSONAL_PROFILE,
() -> mContext.getString( () -> mContext.getString(
R.string.enterprise_privacy_always_on_vpn_personal))); R.string.enterprise_privacy_always_on_vpn_personal)));
} else { } else {
preference.setTitle( preference.setTitle(
mDevicePolicyManager.getString(ALWAYS_ON_VPN_DEVICE, mDevicePolicyManager.getResources().getString(ALWAYS_ON_VPN_DEVICE,
() -> mContext.getString( () -> mContext.getString(
R.string.enterprise_privacy_always_on_vpn_device))); R.string.enterprise_privacy_always_on_vpn_device)));
} }

4
src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
View File

@@ -47,11 +47,11 @@ public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceCon
super.updateState(preference); super.updateState(preference);
if (mFeatureProvider.isInCompMode()) { if (mFeatureProvider.isInCompMode()) {
preference.setTitle(mDevicePolicyManager.getString( preference.setTitle(mDevicePolicyManager.getResources().getString(
CA_CERTS_PERSONAL_PROFILE, CA_CERTS_PERSONAL_PROFILE,
() -> mContext.getString(R.string.enterprise_privacy_ca_certs_personal))); () -> mContext.getString(R.string.enterprise_privacy_ca_certs_personal)));
} else { } else {
preference.setTitle(mDevicePolicyManager.getString( preference.setTitle(mDevicePolicyManager.getResources().getString(
CA_CERTS_DEVICE, CA_CERTS_DEVICE,
() -> mContext.getString(R.string.enterprise_privacy_ca_certs_device))); () -> mContext.getString(R.string.enterprise_privacy_ca_certs_device)));
} }

6
src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
View File

@@ -39,7 +39,7 @@ class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
@Override @Override
public String getDefaultDisabledByPolicyTitle() { public String getDefaultDisabledByPolicyTitle() {
return mDevicePolicyManager.getString(DISABLED_BY_IT_ADMIN_TITLE, return mDevicePolicyManager.getResources().getString(DISABLED_BY_IT_ADMIN_TITLE,
() -> mContext.getString(R.string.disabled_by_policy_title)); () -> mContext.getString(R.string.disabled_by_policy_title));
} }
@@ -75,13 +75,13 @@ class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
@Override @Override
public String getDefaultDisabledByPolicyContent() { public String getDefaultDisabledByPolicyContent() {
return mDevicePolicyManager.getString(CONTACT_YOUR_IT_ADMIN, return mDevicePolicyManager.getResources().getString(CONTACT_YOUR_IT_ADMIN,
() -> mContext.getString(R.string.default_admin_support_msg)); () -> mContext.getString(R.string.default_admin_support_msg));
} }
@Override @Override
public String getLearnMoreHelpPageUrl() { public String getLearnMoreHelpPageUrl() {
return mDevicePolicyManager.getString(IT_ADMIN_POLICY_DISABLING_INFO_URL, return mDevicePolicyManager.getResources().getString(IT_ADMIN_POLICY_DISABLING_INFO_URL,
() -> mContext.getString(R.string.help_url_action_disabled_by_it_admin)); () -> mContext.getString(R.string.help_url_action_disabled_by_it_admin));
} }

4
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -98,11 +98,11 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
final SpannableStringBuilder disclosure = new SpannableStringBuilder(); final SpannableStringBuilder disclosure = new SpannableStringBuilder();
final CharSequence organizationName = mDpm.getDeviceOwnerOrganizationName(); final CharSequence organizationName = mDpm.getDeviceOwnerOrganizationName();
if (organizationName != null) { if (organizationName != null) {
disclosure.append(mDpm.getString(DEVICE_MANAGED_WITH_NAME, disclosure.append(mDpm.getResources().getString(DEVICE_MANAGED_WITH_NAME,
() -> mResources.getString(R.string.do_disclosure_with_name, () -> mResources.getString(R.string.do_disclosure_with_name,
organizationName), organizationName)); organizationName), organizationName));
} else { } else {
disclosure.append(mDpm.getString(DEVICE_MANAGED_WITHOUT_NAME, disclosure.append(mDpm.getResources().getString(DEVICE_MANAGED_WITHOUT_NAME,
() -> mResources.getString(R.string.do_disclosure_generic))); () -> mResources.getString(R.string.do_disclosure_generic)));
} }
return disclosure; return disclosure;

4
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -134,11 +134,11 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends
final PreferenceCategory category = new PreferenceCategory(prefContext); final PreferenceCategory category = new PreferenceCategory(prefContext);
screen.addPreference(category); screen.addPreference(category);
if (userInfo.isManagedProfile()) { if (userInfo.isManagedProfile()) {
category.setTitle(devicePolicyManager.getString( category.setTitle(devicePolicyManager.getResources().getString(
WORK_CATEGORY_HEADER, WORK_CATEGORY_HEADER,
() -> mContext.getString(R.string.category_work))); () -> mContext.getString(R.string.category_work)));
} else { } else {
category.setTitle(devicePolicyManager.getString( category.setTitle(devicePolicyManager.getResources().getString(
PERSONAL_CATEGORY_HEADER, PERSONAL_CATEGORY_HEADER,
() -> mContext.getString(R.string.category_personal))); () -> mContext.getString(R.string.category_personal)));
} }

2
src/com/android/settings/enterprise/ImePreferenceController.java
View File

@@ -41,7 +41,7 @@ public class ImePreferenceController extends AbstractPreferenceController implem
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
preference.setSummary( preference.setSummary(
mContext.getSystemService(DevicePolicyManager.class) mContext.getSystemService(DevicePolicyManager.class).getResources()
.getString(ADMIN_ACTION_SET_INPUT_METHOD_NAME, () -> .getString(ADMIN_ACTION_SET_INPUT_METHOD_NAME, () ->
mContext.getResources().getString( mContext.getResources().getString(
R.string.enterprise_privacy_input_method_name, R.string.enterprise_privacy_input_method_name,

2
src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
View File

@@ -42,7 +42,7 @@ public class ManageDeviceAdminPreferenceController extends BasePreferenceControl
= mFeatureProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile(); = mFeatureProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile();
if (activeAdmins == 0) { if (activeAdmins == 0) {
return mDevicePolicyManager.getString(NUMBER_OF_DEVICE_ADMINS_NONE, return mDevicePolicyManager.getResources().getString(NUMBER_OF_DEVICE_ADMINS_NONE,
() -> mContext.getResources().getString(R.string.number_of_device_admins_none)); () -> mContext.getResources().getString(R.string.number_of_device_admins_none));
} }

12
src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
View File

@@ -52,16 +52,16 @@ class PrivacyPreferenceControllerHelper {
final String organizationName = mFeatureProvider.getDeviceOwnerOrganizationName(); final String organizationName = mFeatureProvider.getDeviceOwnerOrganizationName();
if (organizationName == null) { if (organizationName == null) {
preference.setSummary(mDevicePolicyManager.getString( preference.setSummary(mDevicePolicyManager.getResources().getString(
MANAGED_DEVICE_INFO_SUMMARY, MANAGED_DEVICE_INFO_SUMMARY,
() -> mContext.getString( () -> mContext.getString(
R.string.enterprise_privacy_settings_summary_generic))); R.string.enterprise_privacy_settings_summary_generic)));
} else { } else {
preference.setSummary(mDevicePolicyManager preference.setSummary(mDevicePolicyManager.getResources().getString(
.getString(MANAGED_DEVICE_INFO_SUMMARY_WITH_NAME, MANAGED_DEVICE_INFO_SUMMARY_WITH_NAME,
() -> mContext.getResources().getString( () -> mContext.getResources().getString(
R.string.enterprise_privacy_settings_summary_with_name, R.string.enterprise_privacy_settings_summary_with_name,
organizationName), organizationName)); organizationName), organizationName));
} }
} }

2
src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
View File

@@ -89,7 +89,7 @@ public class WorkModeConditionController implements ConditionalCardController {
@Override @Override
public ContextualCard buildContextualCard() { public ContextualCard buildContextualCard() {
String conditionWorkTitle = mDpm.getString(WORK_PROFILE_OFF_CONDITION_TITLE, String conditionWorkTitle = mDpm.getResources().getString(WORK_PROFILE_OFF_CONDITION_TITLE,
() -> mAppContext.getString(R.string.condition_work_title)); () -> mAppContext.getString(R.string.condition_work_title));
return new ConditionalContextualCard.Builder() return new ConditionalContextualCard.Builder()
.setConditionId(ID) .setConditionId(ID)

5
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -107,7 +107,7 @@ public class NotificationAccessSettings extends EmptyTextSettings {
if (UserManager.get(mContext).isManagedProfile()) { if (UserManager.get(mContext).isManagedProfile()) {
// Apps in the work profile do not support notification listeners. // Apps in the work profile do not support notification listeners.
Toast.makeText(mContext, Toast.makeText(mContext,
mDpm.getString(WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS, mDpm.getResources().getString(WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS,
() -> mContext.getString(R.string.notification_settings_work_profile)), () -> mContext.getString(R.string.notification_settings_work_profile)),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
finish(); finish();
@@ -168,7 +168,8 @@ public class NotificationAccessSettings extends EmptyTextSettings {
if (managedProfileId != UserHandle.USER_NULL if (managedProfileId != UserHandle.USER_NULL
&& !mDpm.isNotificationListenerServicePermitted( && !mDpm.isNotificationListenerServicePermitted(
service.packageName, managedProfileId)) { service.packageName, managedProfileId)) {
pref.setSummary(mDpm.getString(WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED, pref.setSummary(mDpm.getResources().getString(
WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED,
() -> getString( () -> getString(
R.string.work_profile_notification_access_blocked_summary))); R.string.work_profile_notification_access_blocked_summary)));
} }

10
src/com/android/settings/notification/SoundWorkSettingsController.java
View File

@@ -257,9 +257,9 @@ public class SoundWorkSettingsController extends AbstractPreferenceController
private void enableWorkSyncSettings() { private void enableWorkSyncSettings() {
mWorkUsePersonalSounds.setChecked(true); mWorkUsePersonalSounds.setChecked(true);
String summary = mContext.getSystemService(DevicePolicyManager.class).getString( String summary = mContext.getSystemService(DevicePolicyManager.class).getResources()
WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_ACTIVE_SUMMARY, .getString(WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_ACTIVE_SUMMARY,
() -> mContext.getString(R.string.work_sound_same_as_personal) () -> mContext.getString(R.string.work_sound_same_as_personal)
); );
if (mWorkPhoneRingtonePreference != null) { if (mWorkPhoneRingtonePreference != null) {
@@ -355,10 +355,10 @@ public class SoundWorkSettingsController extends AbstractPreferenceController
context.getSystemService(DevicePolicyManager.class); context.getSystemService(DevicePolicyManager.class);
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(devicePolicyManager.getString( .setTitle(devicePolicyManager.getResources().getString(
ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_TITLE, ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_TITLE,
() -> context.getString(R.string.work_sync_dialog_title))) () -> context.getString(R.string.work_sync_dialog_title)))
.setMessage(devicePolicyManager.getString( .setMessage(devicePolicyManager.getResources().getString(
ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_MESSAGE, ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_MESSAGE,
() -> context.getString(R.string.work_sync_dialog_message))) () -> context.getString(R.string.work_sync_dialog_message)))
.setPositiveButton(R.string.work_sync_dialog_yes, .setPositiveButton(R.string.work_sync_dialog_yes,

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

@@ -396,16 +396,18 @@ public class ChooseLockGeneric extends SettingsActivity {
} }
} else { } else {
if (mIsManagedProfile) { if (mIsManagedProfile) {
textView.setText(mDpm.getString(WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE, textView.setText(mDpm.getResources().getString(
WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE,
() -> getString(R.string.lock_settings_picker_profile_message))); () -> getString(R.string.lock_settings_picker_profile_message)));
} else { } else {
int profileUserId = Utils.getManagedProfileId(mUserManager, mUserId); int profileUserId = Utils.getManagedProfileId(mUserManager, mUserId);
if (mController.isScreenLockRestrictedByAdmin() if (mController.isScreenLockRestrictedByAdmin()
&& profileUserId != UserHandle.USER_NULL) { && profileUserId != UserHandle.USER_NULL) {
final StringBuilder description = new StringBuilder( final StringBuilder description = new StringBuilder(
mDpm.getString(WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK, () -> mDpm.getResources().getString(
getString( WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK,
R.string.lock_settings_picker_admin_restricted_personal_message))); () -> getString(
R.string.lock_settings_picker_admin_restricted_personal_message)));
final LinkifyUtils.OnClickListener clickListener = () -> { final LinkifyUtils.OnClickListener clickListener = () -> {
final Bundle extras = new Bundle(); final Bundle extras = new Bundle();
extras.putInt(Intent.EXTRA_USER_ID, profileUserId); extras.putInt(Intent.EXTRA_USER_ID, profileUserId);

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

@@ -24,7 +24,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_W
import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_WORK_PROFILE_PIN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PASSWORD_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PIN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED; import static android.app.admin.DevicePolicyResources.UNDEFINED;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE; import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE;
import static com.android.internal.widget.PasswordValidationError.CONTAINS_INVALID_CHARACTERS; import static com.android.internal.widget.PasswordValidationError.CONTAINS_INVALID_CHARACTERS;
@@ -389,7 +389,7 @@ public class ChooseLockPassword extends SettingsActivity {
} else if (type == TYPE_BIOMETRIC) { } else if (type == TYPE_BIOMETRIC) {
return context.getString(alphaHintForBiometrics); return context.getString(alphaHintForBiometrics);
} else if (isProfile) { } else if (isProfile) {
return context.getSystemService(DevicePolicyManager.class) return context.getSystemService(DevicePolicyManager.class).getResources()
.getString(alphaHintOverrideForProfile, .getString(alphaHintOverrideForProfile,
() -> context.getString(alphaHintForProfile)); () -> context.getString(alphaHintForProfile));
} else { } else {
@@ -403,7 +403,7 @@ public class ChooseLockPassword extends SettingsActivity {
} else if (type == TYPE_BIOMETRIC) { } else if (type == TYPE_BIOMETRIC) {
return context.getString(numericHintForBiometrics); return context.getString(numericHintForBiometrics);
} else if (isProfile) { } else if (isProfile) {
return context.getSystemService(DevicePolicyManager.class) return context.getSystemService(DevicePolicyManager.class).getResources()
.getString(numericHintOverrideForProfile, .getString(numericHintOverrideForProfile,
() -> context.getString(numericHintForProfile)); () -> context.getString(numericHintForProfile));
} else { } else {
@@ -848,11 +848,11 @@ public class ChooseLockPassword extends SettingsActivity {
DevicePolicyManager devicePolicyManager = DevicePolicyManager devicePolicyManager =
getContext().getSystemService(DevicePolicyManager.class); getContext().getSystemService(DevicePolicyManager.class);
if (mIsAlphaMode) { if (mIsAlphaMode) {
messages.add(devicePolicyManager.getString( messages.add(devicePolicyManager.getResources().getString(
PASSWORD_RECENTLY_USED, PASSWORD_RECENTLY_USED,
() -> getString(R.string.lockpassword_password_recently_used))); () -> getString(R.string.lockpassword_password_recently_used)));
} else { } else {
messages.add(devicePolicyManager.getString( messages.add(devicePolicyManager.getResources().getString(
PIN_RECENTLY_USED, PIN_RECENTLY_USED,
() -> getString(R.string.lockpassword_pin_recently_used))); () -> getString(R.string.lockpassword_pin_recently_used)));
} }

2
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -482,7 +482,7 @@ public class ChooseLockPattern extends SettingsActivity {
} else if (mForFace) { } else if (mForFace) {
msg = getString(R.string.lockpassword_choose_your_pattern_header_for_face); msg = getString(R.string.lockpassword_choose_your_pattern_header_for_face);
} else if (mIsManagedProfile) { } else if (mIsManagedProfile) {
msg = getContext().getSystemService(DevicePolicyManager.class) msg = getContext().getSystemService(DevicePolicyManager.class).getResources()
.getString(SET_WORK_PROFILE_PATTERN_HEADER, .getString(SET_WORK_PROFILE_PATTERN_HEADER,
() -> getString( () -> getString(
R.string.lockpassword_choose_your_profile_pattern_header)); R.string.lockpassword_choose_your_profile_pattern_header));

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

@@ -272,7 +272,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
case LockPatternUtils.CREDENTIAL_TYPE_PIN: case LockPatternUtils.CREDENTIAL_TYPE_PIN:
if (isEffectiveUserManagedProfile) { if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PIN_HEADER, CONFIRM_WORK_PROFILE_PIN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pin_header)); () -> getString(R.string.lockpassword_confirm_your_work_pin_header));
} }
@@ -280,7 +280,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pin_header); return getString(R.string.lockpassword_confirm_your_pin_header);
case LockPatternUtils.CREDENTIAL_TYPE_PATTERN: case LockPatternUtils.CREDENTIAL_TYPE_PATTERN:
if (isEffectiveUserManagedProfile) { if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PATTERN_HEADER, CONFIRM_WORK_PROFILE_PATTERN_HEADER,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_work_pattern_header)); R.string.lockpassword_confirm_your_work_pattern_header));
@@ -289,7 +289,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pattern_header); return getString(R.string.lockpassword_confirm_your_pattern_header);
case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD: case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD:
if (isEffectiveUserManagedProfile) { if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PASSWORD_HEADER, CONFIRM_WORK_PROFILE_PASSWORD_HEADER,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_work_password_header)); R.string.lockpassword_confirm_your_work_password_header));
@@ -305,7 +305,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
switch (credentialType) { switch (credentialType) {
case LockPatternUtils.CREDENTIAL_TYPE_PIN: case LockPatternUtils.CREDENTIAL_TYPE_PIN:
if (isEffectiveUserManagedProfile) { if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PIN, return mDevicePolicyManager.getResources().getString(WORK_PROFILE_CONFIRM_PIN,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_pin_generic_profile)); R.string.lockpassword_confirm_your_pin_generic_profile));
} }
@@ -313,7 +313,8 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pin_generic); return getString(R.string.lockpassword_confirm_your_pin_generic);
case LockPatternUtils.CREDENTIAL_TYPE_PATTERN: case LockPatternUtils.CREDENTIAL_TYPE_PATTERN:
if (isEffectiveUserManagedProfile) { if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PATTERN, return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_PATTERN,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_pattern_generic_profile)); R.string.lockpassword_confirm_your_pattern_generic_profile));
} }
@@ -321,7 +322,8 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pattern_generic); return getString(R.string.lockpassword_confirm_your_pattern_generic);
case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD: case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD:
if (isEffectiveUserManagedProfile) { if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PASSWORD, return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_PASSWORD,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_password_generic_profile)); R.string.lockpassword_confirm_your_password_generic_profile));
} }

5
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -247,7 +247,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
R.string.lock_last_attempt_before_wipe_warning_title); R.string.lock_last_attempt_before_wipe_warning_title);
final String overrideMessageId = getLastTryOverrideErrorMessageId(userType); final String overrideMessageId = getLastTryOverrideErrorMessageId(userType);
final int defaultMessageId = getLastTryDefaultErrorMessage(userType); final int defaultMessageId = getLastTryDefaultErrorMessage(userType);
final String message = mDevicePolicyManager.getString( final String message = mDevicePolicyManager.getResources().getString(
overrideMessageId, () -> getString(defaultMessageId)); overrideMessageId, () -> getString(defaultMessageId));
LastTryDialog.show(fragmentManager, title, message, LastTryDialog.show(fragmentManager, title, message,
android.R.string.ok, false /* dismiss */); android.R.string.ok, false /* dismiss */);
@@ -279,7 +279,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
case USER_TYPE_PRIMARY: case USER_TYPE_PRIMARY:
return getString(R.string.lock_failed_attempts_now_wiping_device); return getString(R.string.lock_failed_attempts_now_wiping_device);
case USER_TYPE_MANAGED_PROFILE: case USER_TYPE_MANAGED_PROFILE:
return mDevicePolicyManager.getString(WORK_PROFILE_LOCK_ATTEMPTS_FAILED, return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_LOCK_ATTEMPTS_FAILED,
() -> getString(R.string.lock_failed_attempts_now_wiping_profile)); () -> getString(R.string.lock_failed_attempts_now_wiping_profile));
case USER_TYPE_SECONDARY: case USER_TYPE_SECONDARY:
return getString(R.string.lock_failed_attempts_now_wiping_user); return getString(R.string.lock_failed_attempts_now_wiping_user);

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

@@ -16,7 +16,6 @@
package com.android.settings.password; package com.android.settings.password;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD;
@@ -25,6 +24,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PIN_ATTEMPT_BEFORE_WIPE; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PIN_ATTEMPT_BEFORE_WIPE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PASSWORD_REQUIRED; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PASSWORD_REQUIRED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PIN_REQUIRED; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PIN_REQUIRED;
import static android.app.admin.DevicePolicyResources.UNDEFINED;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
@@ -256,12 +256,12 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
} }
if (mIsManagedProfile) { if (mIsManagedProfile) {
if (mIsAlpha) { if (mIsAlpha) {
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PASSWORD_HEADER, CONFIRM_WORK_PROFILE_PASSWORD_HEADER,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_work_password_header)); R.string.lockpassword_confirm_your_work_password_header));
} }
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PIN_HEADER, CONFIRM_WORK_PROFILE_PIN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pin_header)); () -> getString(R.string.lockpassword_confirm_your_work_pin_header));
} }
@@ -278,7 +278,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
// Map boolean flags to an index by isStrongAuth << 2 + isManagedProfile << 1 + isAlpha. // Map boolean flags to an index by isStrongAuth << 2 + isManagedProfile << 1 + isAlpha.
int index = ((isStrongAuthRequired ? 1 : 0) << 2) + ((mIsManagedProfile ? 1 : 0) << 1) int index = ((isStrongAuthRequired ? 1 : 0) << 2) + ((mIsManagedProfile ? 1 : 0) << 1)
+ (mIsAlpha ? 1 : 0); + (mIsAlpha ? 1 : 0);
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
DETAIL_TEXT_OVERRIDES[index], () -> getString(DETAIL_TEXTS[index])); DETAIL_TEXT_OVERRIDES[index], () -> getString(DETAIL_TEXTS[index]));
} }

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

@@ -16,11 +16,11 @@
package com.android.settings.password; package com.android.settings.password;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PATTERN_REQUIRED; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PATTERN_REQUIRED;
import static android.app.admin.DevicePolicyResources.UNDEFINED;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
@@ -271,11 +271,13 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
final boolean isStrongAuthRequired = isStrongAuthRequired(); final boolean isStrongAuthRequired = isStrongAuthRequired();
if (mIsManagedProfile) { if (mIsManagedProfile) {
if (isStrongAuthRequired) { if (isStrongAuthRequired) {
return mDevicePolicyManager.getString(WORK_PROFILE_PATTERN_REQUIRED, return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_PATTERN_REQUIRED,
() -> getString( () -> getString(
R.string.lockpassword_strong_auth_required_work_pattern)); R.string.lockpassword_strong_auth_required_work_pattern));
} else { } else {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PATTERN, return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_PATTERN,
() -> getString( () -> getString(
R.string.lockpassword_confirm_your_pattern_generic_profile)); R.string.lockpassword_confirm_your_pattern_generic_profile));
} }
@@ -368,7 +370,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
if (mFrp) return getString(R.string.lockpassword_confirm_your_pattern_header_frp); if (mFrp) return getString(R.string.lockpassword_confirm_your_pattern_header_frp);
if (mIsManagedProfile) { if (mIsManagedProfile) {
return mDevicePolicyManager.getString( return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PATTERN_HEADER, CONFIRM_WORK_PROFILE_PATTERN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pattern_header)); () -> getString(R.string.lockpassword_confirm_your_work_pattern_header));
} }

2
src/com/android/settings/password/ForgotPasswordActivity.java
View File

@@ -51,7 +51,7 @@ public class ForgotPasswordActivity extends Activity {
DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class); DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
TextView forgotPasswordText = (TextView) findViewById(R.id.forgot_password_text); TextView forgotPasswordText = (TextView) findViewById(R.id.forgot_password_text);
forgotPasswordText.setText(devicePolicyManager.getString( forgotPasswordText.setText(devicePolicyManager.getResources().getString(
FORGOT_PASSWORD_TEXT, () -> getString(R.string.forgot_password_text))); FORGOT_PASSWORD_TEXT, () -> getString(R.string.forgot_password_text)));
final GlifLayout layout = findViewById(R.id.setup_wizard_layout); final GlifLayout layout = findViewById(R.id.setup_wizard_layout);

3
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -192,7 +192,8 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
*/ */
public void startUnification() { public void startUnification() {
// Confirm profile lock // Confirm profile lock
final String title = mDpm.getString(WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE, final String title = mDpm.getResources().getString(
WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE,
() -> mContext.getString(R.string.unlock_set_unlock_launch_picker_title_profile)); () -> mContext.getString(R.string.unlock_set_unlock_launch_picker_title_profile));
final ChooseLockSettingsHelper.Builder builder = final ChooseLockSettingsHelper.Builder builder =
new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost); new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);

2
src/com/android/settings/security/UnificationConfirmationDialog.java
View File

@@ -65,7 +65,7 @@ public class UnificationConfirmationDialog extends InstrumentedDialogFragment {
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(R.string.lock_settings_profile_unification_dialog_title) .setTitle(R.string.lock_settings_profile_unification_dialog_title)
.setMessage(getContext().getSystemService(DevicePolicyManager.class) .setMessage(getContext().getSystemService(DevicePolicyManager.class).getResources()
.getString(overrideMessageId, () -> getString(defaultMessageId))) .getString(overrideMessageId, () -> getString(defaultMessageId)))
.setPositiveButton( .setPositiveButton(
compliant ? R.string.lock_settings_profile_unification_dialog_confirm compliant ? R.string.lock_settings_profile_unification_dialog_confirm

2
src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
View File

@@ -124,7 +124,7 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont
private void updateLockAfterPreferenceSummary(TimeoutListPreference preference) { private void updateLockAfterPreferenceSummary(TimeoutListPreference preference) {
final CharSequence summary; final CharSequence summary;
if (preference.isDisabledByAdmin()) { if (preference.isDisabledByAdmin()) {
summary = mDPM.getString(DISABLED_BY_IT_ADMIN_TITLE, summary = mDPM.getResources().getString(DISABLED_BY_IT_ADMIN_TITLE,
() -> mContext.getString(R.string.disabled_by_policy_title)); () -> mContext.getString(R.string.disabled_by_policy_title));
} else { } else {
// Update summary message with current value // Update summary message with current value

10
src/com/android/settings/users/UserDialogs.java
View File

@@ -63,13 +63,13 @@ public final class UserDialogs {
.setPositiveButton(R.string.user_delete_button, onConfirmListener) .setPositiveButton(R.string.user_delete_button, onConfirmListener)
.setNegativeButton(android.R.string.cancel, null); .setNegativeButton(android.R.string.cancel, null);
if (userInfo.isManagedProfile()) { if (userInfo.isManagedProfile()) {
builder.setTitle(dpm.getString(WORK_PROFILE_CONFIRM_REMOVE_TITLE, builder.setTitle(dpm.getResources().getString(WORK_PROFILE_CONFIRM_REMOVE_TITLE,
() -> context.getString(R.string.work_profile_confirm_remove_title))); () -> context.getString(R.string.work_profile_confirm_remove_title)));
View view = createRemoveManagedUserDialogView(context, removingUserId); View view = createRemoveManagedUserDialogView(context, removingUserId);
if (view != null) { if (view != null) {
builder.setView(view); builder.setView(view);
} else { } else {
builder.setMessage(dpm.getString(WORK_PROFILE_CONFIRM_REMOVE_MESSAGE, builder.setMessage(dpm.getResources().getString(WORK_PROFILE_CONFIRM_REMOVE_MESSAGE,
() -> context.getString(R.string.work_profile_confirm_remove_message))); () -> context.getString(R.string.work_profile_confirm_remove_message)));
} }
} else if (UserHandle.myUserId() == removingUserId) { } else if (UserHandle.myUserId() == removingUserId) {
@@ -107,12 +107,14 @@ public final class UserDialogs {
TextView openingParagraph = (TextView) TextView openingParagraph = (TextView)
view.findViewById(R.id.delete_managed_profile_opening_paragraph); view.findViewById(R.id.delete_managed_profile_opening_paragraph);
openingParagraph.setText(devicePolicyManager.getString(WORK_PROFILE_MANAGED_BY, openingParagraph.setText(devicePolicyManager.getResources().getString(
WORK_PROFILE_MANAGED_BY,
() -> context.getString( () -> context.getString(
R.string.opening_paragraph_delete_profile_unknown_company))); R.string.opening_paragraph_delete_profile_unknown_company)));
TextView closingParagraph = (TextView) TextView closingParagraph = (TextView)
view.findViewById(R.id.delete_managed_profile_closing_paragraph); view.findViewById(R.id.delete_managed_profile_closing_paragraph);
closingParagraph.setText(devicePolicyManager.getString(WORK_PROFILE_CONFIRM_REMOVE_MESSAGE, closingParagraph.setText(devicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_REMOVE_MESSAGE,
() -> context.getString(R.string.work_profile_confirm_remove_message))); () -> context.getString(R.string.work_profile_confirm_remove_message)));
CharSequence appLabel = packageManager.getApplicationLabel(mdmApplicationInfo); CharSequence appLabel = packageManager.getApplicationLabel(mdmApplicationInfo);

3
src/com/android/settings/utils/ManagedServiceSettings.java
View File

@@ -136,7 +136,8 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
if (managedProfileId != UserHandle.USER_NULL if (managedProfileId != UserHandle.USER_NULL
&& !mDpm.isNotificationListenerServicePermitted( && !mDpm.isNotificationListenerServicePermitted(
service.packageName, managedProfileId)) { service.packageName, managedProfileId)) {
pref.setSummary(mDpm.getString(WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED, pref.setSummary(mDpm.getResources().getString(
WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED,
() -> getString( () -> getString(
R.string.work_profile_notification_access_blocked_summary))); R.string.work_profile_notification_access_blocked_summary)));
} }