Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread

This commit is contained in:
Dan Morrill
2011-06-09 14:43:58 -07:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 1 deletions

View File

@@ -457,4 +457,8 @@
<string name="config_wimaxServiceClassname"></string>
<!-- Name of the wimax state tracker clas -->
<string name="config_wimaxStateTrackerClassname"></string>
<!-- Set to true if the RSSI should always display CDMA signal strength
even on EVDO -->
<bool name="config_alwaysUseCdmaRssi">false</bool>
</resources>

View File

@@ -1075,10 +1075,13 @@ public class StatusBarPolicy {
} else {
iconList = sSignalImages[mInetCondition];
boolean alwaysUseCdmaRssi = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_alwaysUseCdmaRssi);
// If 3G(EV) and 1x network are available than 3G should be
// displayed, displayed RSSI should be from the EV side.
// If a voice call is made then RSSI should switch to 1x.
if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo()){
if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo()
&& !alwaysUseCdmaRssi) {
iconLevel = getEvdoLevel();
if (false) {
Slog.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level=" + getCdmaLevel());