Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev

This commit is contained in:
Pankaj Kanwar
2016-03-11 20:38:10 +00:00
committed by Android (Google) Code Review
4 changed files with 1 additions and 65 deletions

View File

@@ -365,28 +365,6 @@
<item>Set usage cycle...</item>
</string-array>
<!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
<string-array name="wifi_frequency_band_entries">
<!-- Operation on both 2.4 GHz and 5 GHz [CHAR LIMIT=25]-->
<item>Automatic</item>
<!-- Operation on 5 GHz alone [CHAR LIMIT=25]-->
<item>5 GHz only</item>
<!-- Operation on 2.4 GHz alone [CHAR LIMIT=25]-->
<item>2.4 GHz only</item>
</string-array>
<!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
<!-- Do not translate. -->
<string-array name="wifi_frequency_band_values">
<!-- Do not translate. -->
<item>0</item>
<!-- Do not translate. -->
<item>1</item>
<!-- Do not translate. -->
<item>2</item>
</string-array>
<!-- Display options for UsageStats class -->
<string-array name="usage_stats_display_order_types">
<item>Usage time</item>

View File

@@ -1791,12 +1791,6 @@
<string name="wifi_advanced_titlebar">Advanced Wi\u2011Fi</string>
<!-- Wi-Fi settings screen, configure, settings section. This is a header shown above configure wifi settings. [CHAR LIMIT=30] -->
<string name="wifi_configure_titlebar">Configure Wi\u2011Fi</string>
<!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
<string name="wifi_setting_frequency_band_title">Wi\u2011Fi frequency band</string>
<!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
<string name="wifi_setting_frequency_band_summary">Specify the frequency range of operation</string>
<!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
<string name="wifi_setting_frequency_band_error">There was a problem setting the frequency band.</string>
<!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
<string name="wifi_advanced_mac_address_title">MAC address</string>
<!-- Title of the screen to adjust IP settings -->