PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am adab9274: Merge "system activity for scan always available setting" into jb-mr2-dev

Browse Source 
* commit 'adab9274c428a445c64cf350d9f1242f21746bdd':
  system activity for scan always available setting
This commit is contained in:
Irfan Sheriff
2013-03-20 23:04:43 +00:00
committed by Android Git Automerger
parent 431a3a84da adab9274c4
commit 0058373a87
3 changed files with 154 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -1433,6 +1433,9 @@
<!-- Do not translate. Concise terminology for wifi with 802.1x EAP security -->
<string name="wifi_security_eap">802.1x EAP</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>
<string name="wifi_scan_always_confirm_allow">Allow</string>
<string name="wifi_scan_always_confirm_deny">Deny</string>
<!-- Button label to connect to a Wi-Fi network -->
<string name="wifi_connect">Connect</string>