summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-06 12:10:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-06 12:10:26 -0700
commit8b55e926f1a50cf38596be915603c08afd1f27ac (patch)
tree4e7b9796ddef8e70feac651545826250fbd6e90a /core/res
parent289c2b25c9ba4319fa3a944851b2c0c59f6d766a (diff)
parentdaf57e5ff495684f93d9ac2f5c5fc826a02f5f7a (diff)
downloadframeworks_base-8b55e926f1a50cf38596be915603c08afd1f27ac.zip
frameworks_base-8b55e926f1a50cf38596be915603c08afd1f27ac.tar.gz
frameworks_base-8b55e926f1a50cf38596be915603c08afd1f27ac.tar.bz2
Merge "Add notification when p2p is enabled"
Diffstat (limited to 'core/res')
-rwxr-xr-xcore/res/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 5e010fe..eeff473 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2684,6 +2684,8 @@
<string name="wifi_p2p_pbc_go_negotiation_request_message">Wi-Fi Direct connection setup request from <xliff:g id="p2p_device_address">%1$s</xliff:g>. Click OK to accept. </string>
<string name="wifi_p2p_pin_go_negotiation_request_message">Wi-Fi Direct connection setup request from <xliff:g id="p2p_device_address">%1$s</xliff:g>. Enter pin to proceed. </string>
<string name="wifi_p2p_pin_display_message">WPS pin <xliff:g id="p2p_wps_pin">%1$s</xliff:g> needs to be entered on the peer device <xliff:g id="p2p_client_address">%2$s</xliff:g> for connection setup to proceed </string>
+ <string name="wifi_p2p_enabled_notification_title">Wi-Fi Direct is on</string>
+ <string name="wifi_p2p_enabled_notification_message">Touch for settings</string>
<!-- Name of the dialog that lets the user choose an accented character to insert -->
<string name="select_character">Insert character</string>