Merge "Wi-Fi network details page fixes." into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
52cf25d03d
@@ -1886,11 +1886,11 @@
|
||||
|
||||
<!-- Wifi Network Details -->
|
||||
<!-- Wifi details preference title to display router IP subnet mask -->
|
||||
<string name="wifi_details_subnet_mask">Subnet Mask</string>
|
||||
<string name="wifi_details_subnet_mask">Subnet mask</string>
|
||||
<!-- Wifi details preference title to display router DNS info -->
|
||||
<string name="wifi_details_dns">DNS</string>
|
||||
<!-- Wifi details preference category title for IPv6 information -->
|
||||
<string name="wifi_details_ipv6_address_header">IPv6 Addresses</string>
|
||||
<string name="wifi_details_ipv6_address_header">IPv6 addresses</string>
|
||||
|
||||
<!-- Wifi saved access points. Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
|
||||
<string name="wifi_saved_access_points_label">Saved networks</string>
|
||||
|
||||
@@ -54,12 +54,16 @@
|
||||
<PreferenceCategory
|
||||
android:key="ip_details_category"
|
||||
android:title="@string/wifi_setup_detail">
|
||||
<com.android.settings.wifi.WifiDetailPreference
|
||||
android:key="mac_address"
|
||||
android:title="@string/wifi_advanced_mac_address_title"
|
||||
android:selectable="false"/>
|
||||
<com.android.settings.wifi.WifiDetailPreference
|
||||
android:key="ip_address"
|
||||
android:title="@string/wifi_ip_address"
|
||||
android:selectable="false"/>
|
||||
<com.android.settings.wifi.WifiDetailPreference
|
||||
android:key="router"
|
||||
android:key="gateway"
|
||||
android:title="@string/wifi_gateway"
|
||||
android:selectable="false"/>
|
||||
<com.android.settings.wifi.WifiDetailPreference
|
||||
|
||||
Reference in New Issue
Block a user