Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9cf2eb6 authored by Rebecca Silberstein's avatar Rebecca Silberstein Committed by android-build-merger
Browse files

Merge "Add a default SSID prefix for local only hotspot" am: e98a2942 am:... 

Merge "Add a default SSID prefix for local only hotspot" am: e98a2942 am: 6fc50516 am: 2f7a1696
am: 01d3ad5c

Change-Id: Ifa2af8e64e0fa7e9d3033aef303872c3de5dd617
parents b263e71d 01d3ad5c

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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 -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,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" />