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

Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev

Browse Source
This commit is contained in:
Kholoud Mohamed
2022-03-19 06:30:10 +00:00
committed by Android (Google) Code Review
parent 70e2ed1b9d de78149c16
commit 51043a1513
49 changed files with 160 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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())
.setIcon(com.android.internal.R.drawable.ic_dialog_alert_material)
.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)))
.setPositiveButton(R.string.okay, null)
.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
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)))
.setView(R.layout.profile_owner_add)
.setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() {
@@ -358,7 +358,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
mAddMsg.setText(mAddMsgText);
mAdminWarning = dialog.findViewById(R.id.admin_warning_simplified);
mAdminWarning.setText(
mDPM.getString(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, () ->
mDPM.getResources().getString(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, () ->
getString(R.string.device_admin_warning_simplified,
mProfileOwnerName), mProfileOwnerName));
return;
@@ -371,7 +371,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
mProfileOwnerWarning = (TextView) findViewById(R.id.profile_owner_warning);
mProfileOwnerWarning.setText(
mDPM.getString(SET_PROFILE_OWNER_POSTSETUP_WARNING,
mDPM.getResources().getString(SET_PROFILE_OWNER_POSTSETUP_WARNING,
() -> getString(R.string.adding_profile_owner_warning)));
mAddMsg = (TextView)findViewById(R.id.add_msg);
@@ -419,7 +419,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
});
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)));
mUninstallButton.setFilterTouchesWhenObscured(true);
mUninstallButton.setOnClickListener(new View.OnClickListener() {
@@ -681,9 +681,10 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
final boolean isManagedProfile = isManagedProfile(mDeviceAdmin);
if (isProfileOwner && isManagedProfile) {
// 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)));
mActionButton.setText(mDPM.getString(REMOVE_WORK_PROFILE,
mActionButton.setText(mDPM.getResources().getString(REMOVE_WORK_PROFILE,
() -> getString(R.string.remove_managed_profile_label)));
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.
if (isProfileOwner) {
// 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)));
} else {
// Show device owner description.
if (isFinancedDevice()) {
mAdminWarning.setText(R.string.admin_financed_message);
} 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)));
}
}
mActionButton.setText(mDPM.getString(REMOVE_DEVICE_ADMIN,
mActionButton.setText(mDPM.getResources().getString(REMOVE_DEVICE_ADMIN,
() -> getString(R.string.remove_device_admin)));
mActionButton.setEnabled(false);
} else {
addDeviceAdminPolicies(false /* showDescription */);
CharSequence label = mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(
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));
setTitle(R.string.active_device_admin_msg);
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)));
} else {
mActionButton.setText(mDPM.getString(REMOVE_DEVICE_ADMIN,
mActionButton.setText(mDPM.getResources().getString(REMOVE_DEVICE_ADMIN,
() -> getString(R.string.remove_device_admin)));
}
}
@@ -740,12 +743,12 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity {
CharSequence label = mDeviceAdmin.getActivityInfo()
.applicationInfo.loadLabel(getPackageManager());
mAdminWarning.setText(
mDPM.getString(NEW_DEVICE_ADMIN_WARNING, () ->
mDPM.getResources().getString(NEW_DEVICE_ADMIN_WARNING, () ->
getString(R.string.device_admin_warning, label
), label));
setTitle(mDPM.getString(ACTIVATE_DEVICE_ADMIN_APP,
setTitle(mDPM.getResources().getString(ACTIVATE_DEVICE_ADMIN_APP,
() -> 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)));
if (isAdminUninstallable()) {
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(
mDevicePolicyManager.getString(overrideKey,
mDevicePolicyManager.getResources().getString(overrideKey,
() -> getString(resource)));
}
@@ -296,19 +296,20 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
final TextView dialogTitle = dialogView.findViewById(
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),
mAppLabel));
final TextView appDataSummary = dialogView.findViewById(R.id.app_data_summary);
appDataSummary.setText(
mDpm.getString(APP_CAN_ACCESS_PERSONAL_DATA,
mDpm.getResources().getString(APP_CAN_ACCESS_PERSONAL_DATA,
() -> getString(
R.string.interact_across_profiles_consent_dialog_app_data_summary,
mAppLabel), mAppLabel));
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(
R.string.interact_across_profiles_consent_dialog_permissions_summary,
mAppLabel),
@@ -316,7 +317,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
final TextView dialogSummary =
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(
R.string.interact_across_profiles_consent_dialog_summary)));
@@ -445,7 +446,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
}
if (!mInstalledInPersonal) {
mInstallBanner.setTitle(
mDpm.getString(INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT,
mDpm.getResources().getString(INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT,
() -> getString(
R.string.interact_across_profiles_install_personal_app_title,
mAppLabel),
@@ -459,7 +460,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
}
if (!mInstalledInWork) {
mInstallBanner.setTitle(
mDpm.getString(INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT,
mDpm.getResources().getString(INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT,
() -> getString(
R.string.interact_across_profiles_install_work_app_title,
mAppLabel),

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

@@ -95,7 +95,8 @@ public class InteractAcrossProfilesSettings extends EmptyTextSettings {
@Override
public boolean onPreferenceClick(Preference preference) {
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)),
packageName,
appInfo.uid,