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

Merge "Update QS network logging string" into sc-dev

Browse Source
This commit is contained in:
Alex Johnston
2021-03-24 20:54:13 +00:00
committed by Android (Google) Code Review
parent 522bb3d9cc 10377240e3
commit 8d95267eea
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/strings.xml
View File

@@ -1282,6 +1282,9 @@
<!-- Disclosure at the bottom of Quick Settings that indicates that the device has a managed profile which can be monitored by the profile owner [CHAR LIMIT=100] --> <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a managed profile which can be monitored by the profile owner [CHAR LIMIT=100] -->
<string name="quick_settings_disclosure_named_managed_profile_monitoring"><xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> may monitor network traffic in your work profile</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring"><xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> may monitor network traffic in your work profile</string>
<!-- Disclosure at the bottom of Quick Settings that indicates that the user's device has a managed profile where network activity is visible to their IT admin [CHAR LIMIT=100] -->
<string name="quick_settings_disclosure_managed_profile_network_activity">Work profile network activity is visible to your IT admin</string>
<!-- Disclosure at the bottom of Quick Settings that indicates that a certificate authorithy is installed on this device and the traffic might be monitored [CHAR LIMIT=100] --> <!-- Disclosure at the bottom of Quick Settings that indicates that a certificate authorithy is installed on this device and the traffic might be monitored [CHAR LIMIT=100] -->
<string name="quick_settings_disclosure_monitoring">Network may be monitored</string> <string name="quick_settings_disclosure_monitoring">Network may be monitored</string>

22
packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java
View File

@@ -283,31 +283,17 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen
return mContext.getString(R.string.quick_settings_disclosure_named_vpn, return mContext.getString(R.string.quick_settings_disclosure_named_vpn,
vpnName); vpnName);
} }
if (hasWorkProfile && isNetworkLoggingEnabled) {
return mContext.getString(
R.string.quick_settings_disclosure_managed_profile_network_activity);
}
if (isProfileOwnerOfOrganizationOwnedDevice) { if (isProfileOwnerOfOrganizationOwnedDevice) {
if (isNetworkLoggingEnabled) {
if (organizationName == null) {
return mContext.getString(
R.string.quick_settings_disclosure_management_monitoring);
}
return mContext.getString(
R.string.quick_settings_disclosure_named_management_monitoring,
organizationName);
}
if (workProfileOrganizationName == null) { if (workProfileOrganizationName == null) {
return mContext.getString(R.string.quick_settings_disclosure_management); return mContext.getString(R.string.quick_settings_disclosure_management);
} }
return mContext.getString(R.string.quick_settings_disclosure_named_management, return mContext.getString(R.string.quick_settings_disclosure_named_management,
workProfileOrganizationName); workProfileOrganizationName);
} }
if (hasWorkProfile && isNetworkLoggingEnabled) {
if (workProfileOrganizationName == null) {
return mContext.getString(
R.string.quick_settings_disclosure_managed_profile_monitoring);
}
return mContext.getString(
R.string.quick_settings_disclosure_named_managed_profile_monitoring,
workProfileOrganizationName);
}
return null; return null;
} }