PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
This commit is contained in:
The Android Open Source Project
2010-04-21 09:46:57 -07:00
parent ea87b6d75c 68b8069862
commit 2c3265af74
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -869,6 +869,9 @@
<!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. --> <!-- 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> <string name="wifi_advanced_mac_address_title">MAC address</string>
<!-- Title of the screen to adjust IP settings --> <!-- 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> <string name="wifi_ip_settings_titlebar">IP settings</string>
<!-- Menu ietm to save the IP settings --> <!-- Menu ietm to save the IP settings -->
<string name="wifi_ip_settings_menu_save">Save</string> <string name="wifi_ip_settings_menu_save">Save</string>

5
res/xml/wifi_advanced_settings.xml
View File

@@ -38,6 +38,11 @@
android:title="@string/wifi_advanced_mac_address_title" 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 <PreferenceCategory
android:title="@string/wifi_ip_settings_titlebar" android:title="@string/wifi_ip_settings_titlebar"
/> />

21
src/com/android/settings/wifi/AdvancedSettings.java
View File

@@ -40,6 +40,7 @@ public class AdvancedSettings extends PreferenceActivity
implements Preference.OnPreferenceChangeListener { implements Preference.OnPreferenceChangeListener {
private static final String KEY_MAC_ADDRESS = "mac_address"; private static final String KEY_MAC_ADDRESS = "mac_address";
private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
private static final String KEY_USE_STATIC_IP = "use_static_ip"; private static final String KEY_USE_STATIC_IP = "use_static_ip";
private static final String KEY_NUM_CHANNELS = "num_channels"; private static final String KEY_NUM_CHANNELS = "num_channels";
private static final String KEY_SLEEP_POLICY = "sleep_policy"; private static final String KEY_SLEEP_POLICY = "sleep_policy";
@@ -109,7 +110,7 @@ public class AdvancedSettings extends PreferenceActivity
initNumChannelsPreference(); initNumChannelsPreference();
} }
initSleepPolicyPreference(); initSleepPolicyPreference();
refreshMacAddress(); refreshWifiInfo();
} }
private void initNumChannelsPreference() { private void initNumChannelsPreference() {
@@ -307,7 +308,7 @@ public class AdvancedSettings extends PreferenceActivity
} }
} }
private void refreshMacAddress() { private void refreshWifiInfo() {
WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
WifiInfo wifiInfo = wifiManager.getConnectionInfo(); WifiInfo wifiInfo = wifiManager.getConnectionInfo();
@@ -315,6 +316,20 @@ public class AdvancedSettings extends PreferenceActivity
String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress(); String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
: getString(R.string.status_unavailable)); : getString(R.string.status_unavailable));
Preference wifiIpAddressPref = findPreference(KEY_CURRENT_IP_ADDRESS);
String ipAddress = null;
if (wifiInfo != null) {
long addr = wifiInfo.getIpAddress();
if (addr != 0) {
// handle negative values whe first octet > 127
if (addr < 0) addr += 0x100000000L;
ipAddress = String.format("%d.%d.%d.%d",
addr & 0xFF, (addr >> 8) & 0xFF, (addr >> 16) & 0xFF, (addr >> 24) & 0xFF);
}
}
wifiIpAddressPref.setSummary(ipAddress == null ?
getString(R.string.status_unavailable) : ipAddress);
} }
} }