summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/deviceinfo
diff options
context:
space:
mode:
authorTK MUN <tk.mun@samsung.com>2011-02-23 18:57:38 +0900
committerSimon Wilson <simonwilson@google.com>2011-03-09 23:02:21 -0800
commit36469186b7459d13688a2ca1c2316dbf172794dd (patch)
treeedf4cbbcf7c82fe14979f7d41aece71a9518249c /src/com/android/settings/deviceinfo
parentf4393101f80f0ca1a10771613a18565323b69fa2 (diff)
downloadpackages_apps_Settings-36469186b7459d13688a2ca1c2316dbf172794dd.tar.gz
packages_apps_Settings-36469186b7459d13688a2ca1c2316dbf172794dd.tar.bz2
packages_apps_Settings-36469186b7459d13688a2ca1c2316dbf172794dd.zip
DO NOT MERGE WiMAX settings menu
1. Show the 4G menu. 2. Show the 4G MAC address 3. Execute 4G setting apk. Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099 Signed-off-by: TK MUN <tk.mun@samsung.com>
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r--src/com/android/settings/deviceinfo/Status.java28
1 files changed, 25 insertions, 3 deletions
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 99a8975e0..56ce4ba6c 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -22,6 +22,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.BatteryManager;
@@ -32,6 +34,7 @@ import android.os.SystemClock;
import android.os.SystemProperties;
import android.preference.Preference;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -62,6 +65,7 @@ import java.lang.ref.WeakReference;
*/
public class Status extends PreferenceActivity {
+ private static final String KEY_WIMAX_MAC_ADDRESS = "wimax_mac_address";
private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
private static final String KEY_BT_ADDRESS = "bt_address";
private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
@@ -233,7 +237,8 @@ public class Status extends PreferenceActivity {
mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
-
+
+ setWimaxStatus();
setWifiStatus();
setBtStatus();
}
@@ -244,7 +249,7 @@ public class Status extends PreferenceActivity {
mPhoneStateReceiver.registerIntent();
registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-
+
updateSignalStrength();
updateServiceState(mPhone.getServiceState());
updateDataState();
@@ -372,7 +377,24 @@ public class Status extends PreferenceActivity {
+ r.getString(R.string.radioInfo_display_asu));
}
}
-
+
+ private void setWimaxStatus() {
+ ConnectivityManager cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
+ NetworkInfo ni = cm.getNetworkInfo(ConnectivityManager.TYPE_WIMAX);
+
+ if (ni == null) {
+ PreferenceScreen root = getPreferenceScreen();
+ Preference ps = (Preference) findPreference(KEY_WIMAX_MAC_ADDRESS);
+ if (ps != null)
+ root.removePreference(ps);
+ } else {
+ Preference wimaxMacAddressPref = findPreference(KEY_WIMAX_MAC_ADDRESS);
+ String macAddress = SystemProperties.get("net.wimax.mac.address",
+ getString(R.string.status_unavailable));
+ wimaxMacAddressPref.setSummary(macAddress);
+ }
+ }
+
private void setWifiStatus() {
WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
WifiInfo wifiInfo = wifiManager.getConnectionInfo();