Merge "Show dialog when user tries to edit a locked down WiFi config"

This commit is contained in:
Zoltan Szatmary-Ban
2015-04-22 10:10:32 +00:00
committed by Android (Google) Code Review
5 changed files with 93 additions and 3 deletions

View File

@@ -1333,6 +1333,8 @@
<!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
<string name="wifi_band_5ghz" translatable="false">5GHz</string>
<!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
<string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and has disabled modifying and deleting this Wi-Fi network. For more information, contact your administrator.</string>
<!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC -->