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

Use dpm getString to allow overrides in framework/base based on settings

Browse Source 
strings.

Test: manual
Bug: 188414370
Change-Id: I6ee7f873f2063ed57a9226f5074a9e40c1733cd5
This commit is contained in:
Jonathan Scott
2022-01-24 13:54:43 +00:00
parent b9d6f0bdd8
commit 6dc7d13cfc
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
View File

@@ -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.UserHandle;
@@ -88,8 +91,11 @@ public class RestrictedPreferenceHelper {
if (mUseAdminDisabledSummary) {
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 (TextUtils.equals(disabledText, summaryView.getText())) {

6
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -1,7 +1,10 @@
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);
}