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

92
src/com/android/settings/enterprise/EnterprisePrivacySettings.java
View File

@@ -16,11 +16,39 @@
package com.android.settings.enterprise;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_ACCESS_CAMERA;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_ACCESS_LOCATION;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_ACCESS_MICROPHONE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_APPS_INSTALLED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_CURRENT_INPUT_METHOD;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_DEFAULT_APPS;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_HTTP_PROXY;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_LOCK_DEVICE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_APPS_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_BUG_REPORT_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_NETWORK_LOGS_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_SECURITY_LOGS_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_USAGE_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_WORK_DATA_WARNING;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_WIPE_DEVICE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_DEVICE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_WORK_PROFILE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ALWAYS_ON_VPN_WORK_PROFILE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CA_CERTS_PERSONAL_PROFILE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CA_CERTS_WORK_PROFILE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CHANGES_BY_ORGANIZATION_TITLE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ENTERPRISE_PRIVACY_FOOTER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.INFORMATION_SEEN_BY_ORGANIZATION_TITLE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_DEVICE_INFO;
import static android.app.admin.DevicePolicyResources.Strings.Settings.YOUR_ACCESS_TO_THIS_DEVICE_TITLE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -45,6 +73,70 @@ public class EnterprisePrivacySettings extends DashboardFragment {
super.onAttach(context);
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
replaceEnterprisePreferenceScreenTitle(
MANAGED_DEVICE_INFO, R.string.enterprise_privacy_settings);
replaceEnterpriseStringTitle("exposure_category",
INFORMATION_SEEN_BY_ORGANIZATION_TITLE,
R.string.enterprise_privacy_exposure_category);
replaceEnterpriseStringTitle("enterprise_privacy_enterprise_data",
ADMIN_CAN_SEE_WORK_DATA_WARNING, R.string.enterprise_privacy_enterprise_data);
replaceEnterpriseStringTitle("enterprise_privacy_installed_packages",
ADMIN_CAN_SEE_APPS_WARNING, R.string.enterprise_privacy_installed_packages);
replaceEnterpriseStringTitle("enterprise_privacy_usage_stats",
ADMIN_CAN_SEE_USAGE_WARNING, R.string.enterprise_privacy_usage_stats);
replaceEnterpriseStringTitle("network_logs",
ADMIN_CAN_SEE_NETWORK_LOGS_WARNING, R.string.enterprise_privacy_network_logs);
replaceEnterpriseStringTitle("bug_reports",
ADMIN_CAN_SEE_BUG_REPORT_WARNING, R.string.enterprise_privacy_bug_reports);
replaceEnterpriseStringTitle("security_logs",
ADMIN_CAN_SEE_SECURITY_LOGS_WARNING, R.string.enterprise_privacy_security_logs);
replaceEnterpriseStringTitle("exposure_changes_category",
CHANGES_BY_ORGANIZATION_TITLE,
R.string.enterprise_privacy_exposure_changes_category);
replaceEnterpriseStringTitle("number_enterprise_installed_packages",
ADMIN_ACTION_APPS_INSTALLED,
R.string.enterprise_privacy_enterprise_installed_packages);
replaceEnterpriseStringTitle("enterprise_privacy_number_location_access_packages",
ADMIN_ACTION_ACCESS_LOCATION, R.string.enterprise_privacy_location_access);
replaceEnterpriseStringTitle("enterprise_privacy_number_microphone_access_packages",
ADMIN_ACTION_ACCESS_MICROPHONE, R.string.enterprise_privacy_microphone_access);
replaceEnterpriseStringTitle("enterprise_privacy_number_camera_access_packages",
ADMIN_ACTION_ACCESS_CAMERA, R.string.enterprise_privacy_camera_access);
replaceEnterpriseStringTitle("number_enterprise_set_default_apps",
ADMIN_ACTION_SET_DEFAULT_APPS,
R.string.enterprise_privacy_enterprise_set_default_apps);
replaceEnterpriseStringTitle("always_on_vpn_managed_profile",
ALWAYS_ON_VPN_WORK_PROFILE, R.string.enterprise_privacy_always_on_vpn_work);
replaceEnterpriseStringTitle("input_method",
ADMIN_ACTION_SET_CURRENT_INPUT_METHOD, R.string.enterprise_privacy_input_method);
replaceEnterpriseStringTitle("global_http_proxy",
ADMIN_ACTION_SET_HTTP_PROXY, R.string.enterprise_privacy_global_http_proxy);
replaceEnterpriseStringTitle("ca_certs_current_user",
CA_CERTS_PERSONAL_PROFILE, R.string.enterprise_privacy_ca_certs_personal);
replaceEnterpriseStringTitle("ca_certs_managed_profile",
CA_CERTS_WORK_PROFILE, R.string.enterprise_privacy_ca_certs_work);
replaceEnterpriseStringTitle("device_access_category",
YOUR_ACCESS_TO_THIS_DEVICE_TITLE,
R.string.enterprise_privacy_device_access_category);
replaceEnterpriseStringTitle("enterprise_privacy_lock_device",
ADMIN_CAN_LOCK_DEVICE, R.string.enterprise_privacy_lock_device);
replaceEnterpriseStringTitle("enterprise_privacy_wipe_device",
ADMIN_CAN_WIPE_DEVICE, R.string.enterprise_privacy_wipe_device);
replaceEnterpriseStringTitle("failed_password_wipe_current_user",
ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_DEVICE,
R.string.enterprise_privacy_failed_password_wipe_device);
replaceEnterpriseStringTitle("failed_password_wipe_managed_profile",
ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_WORK_PROFILE,
R.string.enterprise_privacy_failed_password_wipe_work);
replaceEnterpriseStringTitle("enterprise_privacy_footer",
ENTERPRISE_PRIVACY_FOOTER, R.string.enterprise_privacy_header);
}
@Override
public void onDetach() {
mPrivacySettingsPreference = null;