Merge "Remove code for old wifi tether feature"
This commit is contained in:
committed by
Android (Google) Code Review
commit
d0b09f7868
@@ -235,13 +235,6 @@
|
||||
<item>@string/wifi_security_psk_generic</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Wi-Fi AP settings. The type of security a Wi-Fi AP supports. -->
|
||||
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
|
||||
<string-array name="wifi_ap_security">
|
||||
<item>@string/wifi_security_none</item>
|
||||
<item>@string/wifi_security_wpa2</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Match this with the constants in WifiDialog. --> <skip />
|
||||
<!-- Wi-Fi settings. The type of EAP method a Wi-Fi network has. -->
|
||||
<string-array name="wifi_eap_method">
|
||||
|
@@ -2093,8 +2093,6 @@
|
||||
<string name="wifi_hotspot_configure_ap_text">Wi\u2011Fi hotspot setup</string>
|
||||
<!-- Summary Used to open the ssid and security dialog for Wifi Access Point. [CHAR LIMIT=60] -->
|
||||
<string name="wifi_hotspot_configure_ap_text_summary">AndroidAP WPA2 PSK hotspot</string>
|
||||
<!-- Subtext on configuration preference to indicate SSID and security chosen -->
|
||||
<string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> hotspot</string>
|
||||
<!-- Default access point SSID used for tethering -->
|
||||
<string name="wifi_tether_configure_ssid_default">AndroidHotspot</string>
|
||||
|
||||
@@ -5194,7 +5192,6 @@
|
||||
<string name="credentials_old_password">Current password:</string>
|
||||
<!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
|
||||
<string name="credentials_reset_hint">Remove all the contents?</string>
|
||||
<string name="credentials_password_too_short">The password must have at least 8 characters.</string>
|
||||
<!-- Error message [CHAR LIMIT=NONE] -->
|
||||
<string name="credentials_wrong_password">Incorrect password.</string>
|
||||
<!-- Error message [CHAR LIMIT=NONE] -->
|
||||
|
Reference in New Issue
Block a user