PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing settings strings.

Browse Source 
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
This commit is contained in:
Jonathan Scott
2022-04-11 09:49:17 +00:00
parent afe6d302e4
commit b7f4f56cad
63 changed files with 470 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/security/SecurityAdvancedSettingsController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.security;
import static android.app.admin.DevicePolicyResources.Strings.Settings.MORE_SECURITY_SETTINGS_WORK_PROFILE_SUMMARY;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.CrossProfileApps;
@@ -29,11 +32,13 @@ import com.android.settings.core.BasePreferenceController;
public class SecurityAdvancedSettingsController extends BasePreferenceController {
private final CrossProfileApps mCrossProfileApps;
private final DevicePolicyManager mDevicePolicyManager;
public SecurityAdvancedSettingsController(Context context, String preferenceKey) {
super(context, preferenceKey);
mCrossProfileApps = context.getSystemService(CrossProfileApps.class);
mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
}
@Override
@@ -44,8 +49,10 @@ public class SecurityAdvancedSettingsController extends BasePreferenceController
@Override
public CharSequence getSummary() {
return isWorkProfilePresent()
? mContext.getResources().getString(
R.string.security_advanced_settings_work_profile_settings_summary)
? mDevicePolicyManager.getResources().getString(
MORE_SECURITY_SETTINGS_WORK_PROFILE_SUMMARY,
() -> mContext.getResources().getString(
R.string.security_advanced_settings_work_profile_settings_summary))
: mContext.getResources().getString(
R.string.security_advanced_settings_no_work_profile_settings_summary);
}