Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de78149c authored by kholoud mohamed's avatar kholoud mohamed
Browse files

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class 

Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
parent 45436a02

src/com/android/settings/MainClear.java

+2 −2
Original line number Diff line number Diff line
@@ -500,10 +500,10 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis 
                        context.getSystemService(DevicePolicyManager.class);



                if (userInfo.isManagedProfile()) {

                    titleText.setText(devicePolicyManager.getString(

                    titleText.setText(devicePolicyManager.getResources().getString(

                            WORK_CATEGORY_HEADER, () -> getString(R.string.category_work)));

                } else {

                    titleText.setText(devicePolicyManager.getString(

                    titleText.setText(devicePolicyManager.getResources().getString(

                            PERSONAL_CATEGORY_HEADER, () -> getString(R.string.category_personal)));

                }

                contents.addView(titleView);

src/com/android/settings/RemoteBugreportActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class RemoteBugreportActivity extends Activity { 


        if (notificationType == DevicePolicyManager.NOTIFICATION_BUGREPORT_ACCEPTED_NOT_FINISHED) {

            AlertDialog dialog = new AlertDialog.Builder(this)

                    .setMessage(devicePolicyManager.getString(

                    .setMessage(devicePolicyManager.getResources().getString(

                            SHARING_REMOTE_BUGREPORT_MESSAGE,

                            () -> getString(R.string.sharing_remote_bugreport_dialog_message)))

                    .setOnDismissListener(new DialogInterface.OnDismissListener() {
@@ -85,9 +85,10 @@ public class RemoteBugreportActivity extends Activity { 
                    : SHARE_REMOTE_BUGREPORT_FINISHED_REQUEST_CONSENT;



            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)))

                    .setMessage(devicePolicyManager.getString(overrideMessageId,

                    .setMessage(devicePolicyManager.getResources().getString(overrideMessageId,

                            () -> getString(defaultMessageId)))

                    .setOnDismissListener(new DialogInterface.OnDismissListener() {

                        @Override

src/com/android/settings/TrustedCredentialsSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -389,10 +389,11 @@ public class TrustedCredentialsSettings extends InstrumentedFragment 


            final TextView title = (TextView) convertView.findViewById(android.R.id.title);

            if (getUserInfoByGroup(groupPosition).isManagedProfile()) {

                title.setText(mDevicePolicyManager.getString(WORK_CATEGORY_HEADER,

                title.setText(mDevicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER,

                        () -> getString(R.string.category_work)));

            } else {

                title.setText(mDevicePolicyManager.getString(PERSONAL_CATEGORY_HEADER,

                title.setText(mDevicePolicyManager.getResources().getString(

                        PERSONAL_CATEGORY_HEADER,

                        () -> getString(R.string.category_personal)));



            }

src/com/android/settings/accounts/AccountPreferenceController.java

+11 −11
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
                        UserHandle.myUserId())) {

                    final SearchIndexableRaw data = new SearchIndexableRaw(mContext);

                    data.key = PREF_KEY_REMOVE_PROFILE;

                    data.title = mDpm.getString(

                    data.title = mDpm.getResources().getString(

                            REMOVE_WORK_PROFILE,

                            () -> res.getString(R.string.remove_managed_profile_label));

                    data.screenTitle = screenTitle;
@@ -207,7 +207,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
                }

                final SearchIndexableRaw data = new SearchIndexableRaw(mContext);

                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));

                data.screenTitle = screenTitle;

                rawData.add(data);
@@ -267,7 +267,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
                new SubSettingLauncher(mContext)

                        .setSourceMetricsCategory(metricsCategory)

                        .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)))

                        .setArguments(arguments)

                        .launch();
@@ -347,12 +347,12 @@ public class AccountPreferenceController extends AbstractPreferenceController 
        } else if (userInfo.isManagedProfile()) {

            if (mType == ProfileSelectFragment.ProfileType.ALL) {

                preferenceGroup.setTitle(

                        mDpm.getString(WORK_CATEGORY_HEADER,

                        mDpm.getResources().getString(WORK_CATEGORY_HEADER,

                                () -> mContext.getString(R.string.category_work)));

                final String workGroupSummary = getWorkGroupSummary(context, userInfo);

                preferenceGroup.setSummary(workGroupSummary);

                preferenceGroup.setContentDescription(

                        mDpm.getString(ACCESSIBILITY_CATEGORY_WORK, () ->

                        mDpm.getResources().getString(ACCESSIBILITY_CATEGORY_WORK, () ->

                        mContext.getString(

                                R.string.accessibility_category_work, workGroupSummary)));

            }
@@ -363,10 +363,10 @@ public class AccountPreferenceController extends AbstractPreferenceController 
        } else {

            if (mType == ProfileSelectFragment.ProfileType.ALL) {

                preferenceGroup.setTitle(

                        mDpm.getString(PERSONAL_CATEGORY_HEADER,

                        mDpm.getResources().getString(PERSONAL_CATEGORY_HEADER,

                                () -> mContext.getString(R.string.category_personal)));

                preferenceGroup.setContentDescription(

                        mDpm.getString(ACCESSIBILITY_CATEGORY_PERSONAL, () ->

                        mDpm.getResources().getString(ACCESSIBILITY_CATEGORY_PERSONAL, () ->

                        mContext.getString(R.string.accessibility_category_personal)));

            }

        }
@@ -401,7 +401,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
                mFragment.getPreferenceManager().getContext());

        preference.setKey(PREF_KEY_REMOVE_PROFILE);

        preference.setTitle(

                mDpm.getString(REMOVE_WORK_PROFILE,

                mDpm.getResources().getString(REMOVE_WORK_PROFILE,

                        () -> mContext.getString(R.string.remove_managed_profile_label)));

        preference.setIcon(R.drawable.ic_delete);

        preference.setOnPreferenceClickListener(this);
@@ -413,7 +413,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
    private Preference newManagedProfileSettings() {

        Preference preference = new Preference(mFragment.getPreferenceManager().getContext());

        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)));

        preference.setIcon(R.drawable.ic_settings_24dp);

        preference.setOnPreferenceClickListener(this);
@@ -428,7 +428,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
            return null;

        }

        CharSequence appLabel = packageManager.getApplicationLabel(adminApplicationInfo);

        return mDpm.getString(MANAGED_BY,

        return mDpm.getResources().getString(MANAGED_BY,

                () -> mContext.getString(R.string.managing_admin, appLabel), appLabel);

    }
@@ -508,7 +508,7 @@ public class AccountPreferenceController extends AbstractPreferenceController 
            mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);

            mProfileNotAvailablePreference.setTitle(null);

            mProfileNotAvailablePreference.setSummary(

                    mDpm.getString(

                    mDpm.getResources().getString(

                            WORK_PROFILE_NOT_AVAILABLE, () -> mContext.getString(

                    R.string.managed_profile_not_available_label)));

            profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);

src/com/android/settings/accounts/AccountSyncSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -163,10 +163,11 @@ public class AccountSyncSettings extends AccountPreferenceBase { 


        String accessibilityTitle =

                isWorkProfile

                        ? devicePolicyManager.getString(ACCESSIBILITY_WORK_ACCOUNT_TITLE,

                        ? devicePolicyManager.getResources().getString(

                                ACCESSIBILITY_WORK_ACCOUNT_TITLE,

                                () -> getString(R.string.accessibility_work_account_title,

                                        currentTitle), currentTitle)

                                : devicePolicyManager.getString(

                                : devicePolicyManager.getResources().getString(

                                        ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE,

                                        () -> getString(

                                                R.string.accessibility_personal_account_title,