am 81807831: Merge change 1582 into donut

Merge commit '818078310759e3fbd227c578e20a54e935b1b92a'

* commit '818078310759e3fbd227c578e20a54e935b1b92a':
  Teleca 2b changes.
This commit is contained in:
Android (Google) Code Review
2009-05-18 23:56:38 -07:00
committed by The Android Open Source Project
2 changed files with 8 additions and 1 deletions

View File

@@ -625,6 +625,9 @@ public class RadioInfo extends Activity {
private final void private final void
updateSignalStrength() { updateSignalStrength() {
// TODO TELECA: PhoneStateIntentReceiver deprecated, use TelephonyManager or
// PhoneStateListener instead.
// Use new SignalStrength for signal
int state = int state =
mPhoneStateReceiver.getServiceState().getState(); mPhoneStateReceiver.getServiceState().getState();
Resources r = getResources(); Resources r = getResources();
@@ -1172,7 +1175,7 @@ public class RadioInfo extends Activity {
mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() { mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() {
public void onItemSelected(AdapterView parent, View v, int pos, long id) { public void onItemSelected(AdapterView parent, View v, int pos, long id) {
Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE); Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
if (pos>=0 && pos<=2) { if (pos>=0 && pos<=7) { //IS THIS NEEDED to extend to the entire range of values
phone.setPreferredNetworkType(pos, msg); phone.setPreferredNetworkType(pos, msg);
} }
} }

View File

@@ -303,6 +303,10 @@ public class Status extends PreferenceActivity {
} }
void updateSignalStrength() { void updateSignalStrength() {
// TODO TELECA: PhoneStateIntentReceiver deprecated, use TelephonyManager or
// PhoneStateListener instead.
// Use new SignalStrength for signal
// not loaded in some versions of the code (e.g., zaku) // not loaded in some versions of the code (e.g., zaku)
if (mSignalStrength != null) { if (mSignalStrength != null) {
int state = int state =