Merge "Add a default SSID prefix for local only hotspot"

am: e98a2942a4

Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
This commit is contained in:
Rebecca Silberstein
2017-04-14 04:12:34 +00:00
committed by android-build-merger
2 changed files with 3 additions and 0 deletions

View File

@@ -2979,6 +2979,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 -->

View File

@@ -981,6 +981,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" />