diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-21 09:51:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 09:51:01 -0700 |
| commit | 1795d18f815568c15b6fc1b1d3cf29b1c193f030 (patch) | |
| tree | e72d67f222f1bd000e9493922815e22be6b74434 /res | |
| parent | e7879010e3dbfd2db193055c60c9825004a3a51a (diff) | |
| parent | 2c3265af7419c35c1084fd5c1e4726abcdd90f40 (diff) | |
| download | packages_apps_Settings-1795d18f815568c15b6fc1b1d3cf29b1c193f030.tar.gz packages_apps_Settings-1795d18f815568c15b6fc1b1d3cf29b1c193f030.tar.bz2 packages_apps_Settings-1795d18f815568c15b6fc1b1d3cf29b1c193f030.zip | |
am 2c3265af: merge from open-source master
Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken
* commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40':
Display current IP address in advanced Wifi settings screen
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/wifi_advanced_settings.xml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5c33ae501..d0cd59255 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -869,6 +869,9 @@ <!-- 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 --> + <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. --> + <string name="wifi_advanced_ip_address_title">IP address</string> + <string name="wifi_ip_settings_titlebar">IP settings</string> <!-- Menu ietm to save the IP settings --> <string name="wifi_ip_settings_menu_save">Save</string> diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml index 3e0ff053f..e603be920 100644 --- a/res/xml/wifi_advanced_settings.xml +++ b/res/xml/wifi_advanced_settings.xml @@ -38,6 +38,11 @@ android:title="@string/wifi_advanced_mac_address_title" /> + <Preference android:key="current_ip_address" + style="?android:attr/preferenceInformationStyle" + android:title="@string/wifi_advanced_ip_address_title" + /> + <PreferenceCategory android:title="@string/wifi_ip_settings_titlebar" /> |