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

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

@@ -62,6 +62,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
if (admin != null) {
preference.setEnabled(false);
preference.setSummary(mContext.getSystemService(DevicePolicyManager.class)
.getResources()
.getString(DISABLED_BY_IT_ADMIN_TITLE,
() -> mContext.getString(R.string.disabled_by_policy_title)));
((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
void setupDisabledFooterPreference() {
final String textDisabledByAdmin = mDevicePolicyManager.getString(
final String textDisabledByAdmin = mDevicePolicyManager.getResources().getString(
OTHER_OPTIONS_DISABLED_BY_ADMIN, () -> getResources().getString(
R.string.admin_disabled_other_options));
final String textMoreDetails = getResources().getString(R.string.admin_more_details);