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

Automated import from //branches/master/...@141186,141186

Browse Source
This commit is contained in:
Mike Ritter
2009-03-24 19:43:56 -07:00
committed by The Android Open Source Project
parent f9359baca6
commit 18f3afb9cd
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/com/android/settings/deviceinfo/Status.java
View File

@@ -178,7 +178,8 @@ public class Status extends PreferenceActivity {
} }
mPhone = PhoneFactory.getDefaultPhone(); mPhone = PhoneFactory.getDefaultPhone();
mSignalStrength = findPreference("signal_strength"); // Note - missing in zaku build, be careful later...
mSignalStrength = findPreference("signal_strength");
mUptime = findPreference("up_time"); mUptime = findPreference("up_time");
mAwakeTime = findPreference("awake_time"); mAwakeTime = findPreference("awake_time");
@@ -238,11 +239,13 @@ public class Status extends PreferenceActivity {
} }
private void setSummaryText(String preference, String text) { private void setSummaryText(String preference, String text) {
if (TextUtils.isEmpty(text)) { if (TextUtils.isEmpty(text)) {
text = sUnknown; text = sUnknown;
} }
// some preferences may be missing
findPreference(preference).setSummary(text); if (findPreference(preference) != null) {
findPreference(preference).setSummary(text);
}
} }
private void updateNetworkType() { private void updateNetworkType() {
@@ -300,27 +303,30 @@ public class Status extends PreferenceActivity {
} }
void updateSignalStrength() { void updateSignalStrength() {
int state = // not loaded in some versions of the code (e.g., zaku)
mPhoneStateReceiver.getServiceState().getState(); if (mSignalStrength != null) {
Resources r = getResources(); int state =
mPhoneStateReceiver.getServiceState().getState();
Resources r = getResources();
if ((ServiceState.STATE_OUT_OF_SERVICE == state) || if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
(ServiceState.STATE_POWER_OFF == state)) { (ServiceState.STATE_POWER_OFF == state)) {
mSignalStrength.setSummary("0"); mSignalStrength.setSummary("0");
}
int signalDbm = mPhoneStateReceiver.getSignalStrengthDbm();
if (-1 == signalDbm) signalDbm = 0;
int signalAsu = mPhoneStateReceiver.getSignalStrength();
if (-1 == signalAsu) signalAsu = 0;
mSignalStrength.setSummary(String.valueOf(signalDbm) + " "
+ r.getString(R.string.radioInfo_display_dbm) + " "
+ String.valueOf(signalAsu) + " "
+ r.getString(R.string.radioInfo_display_asu));
} }
int signalDbm = mPhoneStateReceiver.getSignalStrengthDbm();
if (-1 == signalDbm) signalDbm = 0;
int signalAsu = mPhoneStateReceiver.getSignalStrength();
if (-1 == signalAsu) signalAsu = 0;
mSignalStrength.setSummary(String.valueOf(signalDbm) + " "
+ r.getString(R.string.radioInfo_display_dbm) + " "
+ String.valueOf(signalAsu) + " "
+ r.getString(R.string.radioInfo_display_asu));
} }
private void setWifiStatus() { private void setWifiStatus() {