summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rebecca Silberstein <silberst@google.com> 2017-04-15 20:37:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-15 20:37:37 +0000
commitd8837b6fca23847fcd4dd295ccbb33ef9d4edcec (patch)
treeae4408b227b890a8105bb17b6c4530f401a81def
parentabbea1df6b877df514f79dcb681db09db311f207 (diff)
parent24f9dcb9e57cc2289eaf579b11f487e030fbe90a (diff)
Merge "Add a default SSID prefix for local only hotspot" into oc-dev
-rw-r--r--core/res/res/values/strings.xml2
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 08216742add5..bd350730a8e2 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3000,6 +3000,8 @@
<!-- Do not translate. Default access point SSID used for tethering -->
<string name="wifi_tether_configure_ssid_default" translatable="false">AndroidAP</string>
+ <!-- Do not translate. Default access point SSID used for local only hotspot -->
+ <string name="wifi_localhotspot_configure_ssid_default" translatable="false">AndroidShare</string>
<!-- A notification is shown the first time a connection is attempted on an app owned AP -->
<!-- title for this message -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 74cbe27a75ad..f2da8457601c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1006,6 +1006,7 @@
<java-symbol type="string" name="wifi_p2p_turnon_message" />
<java-symbol type="string" name="wifi_p2p_frequency_conflict_message" />
<java-symbol type="string" name="wifi_tether_configure_ssid_default" />
+ <java-symbol type="string" name="wifi_localhotspot_configure_ssid_default" />
<java-symbol type="string" name="wifi_watchdog_network_disabled" />
<java-symbol type="string" name="wifi_watchdog_network_disabled_detailed" />
<java-symbol type="string" name="imei" />