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

Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev

Browse Source 
am: 106dc34fb2

Change-Id: I9dd602dd5cb0e6a5d11f22fd8ffd1b3b6efdf471
This commit is contained in:
Tony Mak
2017-08-11 10:51:49 +00:00
committed by android-build-merger
parent 37e9acb65a 106dc34fb2
commit 5d5d865dc8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1152,7 +1152,7 @@
<string name="monitoring_description_vpn_settings_separator">" "</string>
<!-- Monitoring dialog: Link to open the VPN settings page [CHAR LIMIT=60] -->
<string name="monitoring_description_vpn_settings">Open VPN Settings</string>
<string name="monitoring_description_vpn_settings">Open VPN settings</string>
<!-- Monitoring dialog: Space that separates the CA certs body text and the "Open trusted credentials" link that follows it. [CHAR LIMIT=5] -->
<string name="monitoring_description_ca_cert_settings_separator">" "</string>

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

@@ -320,7 +320,7 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic
}
private String getPositiveButton() {
return mContext.getString(R.string.quick_settings_done);
return mContext.getString(R.string.ok);
}
protected CharSequence getManagementMessage(boolean isDeviceManaged,