am a1a107b8: 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
* commit 'a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
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.
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 90f43a4..75d5089 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -479,4 +479,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>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
index 963b5b2..a9300f36 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
@@ -1075,10 +1075,13 @@
} 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());