am 5cc298c8: am 8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev

* commit '5cc298c838e8fa6dd540624fa354e7d2fab16f92':
  Implement Settings app UX for when a user has wifi config locked down.
This commit is contained in:
Maggie Benthall
2013-04-12 14:38:47 -07:00
committed by Android Git Automerger
2 changed files with 17 additions and 0 deletions

View File

@@ -1207,6 +1207,8 @@
<string name="wifi_display_searching_for_devices">Searching\u2026</string>
<!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
<string name="wifi_display_no_devices_found">No nearby wireless displays were found.</string>
<!-- Wifi Display settings. Text displayed when user has restriction DISALLOW_CONFIG_WIFI-->
<string name="wifi_display_settings_empty_list_user_restricted">This user is not allowed to configure wireless networks.</string>
<!-- Wifi Display settings. The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
<string name="wifi_display_paired_devices">Paired displays</string>
<!-- Wifi Display settings. The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->