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

Commit 2614e63d authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge changes from topic "settingsoverride" 

* changes:
  Use dpm getString to allow overrides in framework/base based on settings strings.
  Add Override Strings for Settings.
parents 92a9e6a0 6dc7d13c

core/java/android/app/admin/DevicePolicyResources.java

+1556 −115

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

+8 −2
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 


package com.android.settingslib;



import static android.app.admin.DevicePolicyResources.Strings.Settings.CONTROLLED_BY_ADMIN_SUMMARY;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.res.TypedArray;

import android.os.Build;
@@ -102,8 +105,11 @@ public class RestrictedPreferenceHelper { 
        if (mDisabledSummary) {

            final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);

            if (summaryView != null) {

                final CharSequence disabledText = summaryView.getContext().getText(

                        R.string.disabled_by_admin_summary_text);

                final CharSequence disabledText = mContext

                        .getSystemService(DevicePolicyManager.class)

                        .getString(CONTROLLED_BY_ADMIN_SUMMARY,

                                () -> summaryView.getContext().getString(

                                        R.string.disabled_by_admin_summary_text));

                if (mDisabledByAdmin) {

                    summaryView.setText(disabledText);

                } else if (mDisabledByAppOps) {

packages/SettingsLib/src/com/android/settingslib/Utils.java

+5 −1
Original line number Diff line number Diff line 
package com.android.settingslib;



import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_USER_LABEL;



import android.annotation.ColorInt;

import android.annotation.Nullable;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;
@@ -124,7 +127,8 @@ public class Utils { 
        String name = info != null ? info.name : null;

        if (info.isManagedProfile()) {

            // We use predefined values for managed profiles

            return context.getString(R.string.managed_user_title);

            return context.getSystemService(DevicePolicyManager.class).getString(

                    WORK_PROFILE_USER_LABEL, () -> context.getString(R.string.managed_user_title));

        } else if (info.isGuest()) {

            name = context.getString(R.string.user_guest);

        }