Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev am: ab3fed9b69

am: 1a5bd24d58

Change-Id: I8f9bd81444f663470b1f7514d51d75d90a1038d6
This commit is contained in:
cosmohsieh
2019-04-12 17:31:13 -07:00
committed by android-build-merger
2 changed files with 6 additions and 1 deletions

View File

@@ -2243,6 +2243,8 @@
<string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string>
<string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
<!-- Message to inform user, an unknown app want to enable network scanning. [CHAR LIMIT=200] -->
<string name="wifi_scan_always_turn_on_message_unknown">To improve location accuracy and for other purposes, an unknown app wants to turn on network scanning, even when Wi\u2011Fi is off.\n\nAllow this for all apps that want to scan?</string>
<!-- Message informing the user how to turn off [CHAR LIMIT=200] -->
<string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string>
<string name="wifi_scan_always_confirm_allow">Allow</string>