Merge "[Provider Model] Saved networks Settings UI change"
This commit is contained in:
committed by
Android (Google) Code Review
commit
e6768c1776
@@ -2289,8 +2289,8 @@
|
|||||||
<string name="wifi_saved_access_points_label">Saved networks</string>
|
<string name="wifi_saved_access_points_label">Saved networks</string>
|
||||||
<!-- Tab title for showing subscribed WiFi access points. [CHAR LIMIT=20] -->
|
<!-- Tab title for showing subscribed WiFi access points. [CHAR LIMIT=20] -->
|
||||||
<string name="wifi_subscribed_access_points_tab">Subscriptions</string>
|
<string name="wifi_subscribed_access_points_tab">Subscriptions</string>
|
||||||
<!-- Tab title for showing saved WiFi access points. -->
|
<!-- Tab title for showing saved other networks. -->
|
||||||
<string name="wifi_saved_access_points_tab">@string/wifi_access_points</string>
|
<string name="wifi_saved_other_networks_tab">Other networks</string>
|
||||||
<!-- Wifi Advanced settings. Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
|
<!-- Wifi Advanced settings. Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
|
||||||
<string name="wifi_advanced_settings_label">IP settings</string>
|
<string name="wifi_advanced_settings_label">IP settings</string>
|
||||||
<!-- Error message for users that aren't allowed to see or modify WiFi advanced settings [CHAR LIMIT=NONE] -->
|
<!-- Error message for users that aren't allowed to see or modify WiFi advanced settings [CHAR LIMIT=NONE] -->
|
||||||
|
@@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="saved_access_points_category"
|
android:key="saved_access_points_category"
|
||||||
android:title="@string/wifi_saved_access_points_tab"
|
android:title="@string/wifi_saved_other_networks_tab"
|
||||||
settings:controller="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsPreferenceController2"/>
|
settings:controller="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsPreferenceController2"/>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
Reference in New Issue
Block a user