diff --git a/res/drawable-hdpi/ic_qs_certificate_info.png b/res/drawable-hdpi/ic_qs_certificate_info.png deleted file mode 100644 index 1fdaaf9f8da..00000000000 Binary files a/res/drawable-hdpi/ic_qs_certificate_info.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_qs_certificate_info.png b/res/drawable-mdpi/ic_qs_certificate_info.png deleted file mode 100644 index 3b49472cd9a..00000000000 Binary files a/res/drawable-mdpi/ic_qs_certificate_info.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_qs_certificate_info.png b/res/drawable-xhdpi/ic_qs_certificate_info.png deleted file mode 100644 index b3de2ce847b..00000000000 Binary files a/res/drawable-xhdpi/ic_qs_certificate_info.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_qs_certificate_info.png b/res/drawable-xxhdpi/ic_qs_certificate_info.png deleted file mode 100644 index 5d6f6c772cd..00000000000 Binary files a/res/drawable-xxhdpi/ic_qs_certificate_info.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_settings_about.png b/res/drawable-xxhdpi/ic_settings_about.png new file mode 100644 index 00000000000..924d96264c1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_settings_about.png differ diff --git a/res/values/strings.xml b/res/values/strings.xml index 83f7c328344..2ebda689fbb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4659,12 +4659,12 @@ Network may be monitored - + Done Network monitoring - This device is managed by: %s.\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator. + This device is managed by:\n%s\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator. A third party is capable of monitoring your network\nactivity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible. diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 13f71665e16..87d34c69553 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -879,7 +879,7 @@ public class Settings extends PreferenceActivity holder.divider_.setVisibility(View.VISIBLE); boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null; if (isManaged) { - holder.button_.setImageResource(R.drawable.ic_qs_certificate_info); + holder.button_.setImageResource(R.drawable.ic_settings_about); } else { holder.button_.setImageResource( android.R.drawable.stat_notify_error);