From e33fc82cc9804ed74cdcc8e3b2529bb75ef0ec69 Mon Sep 17 00:00:00 2001
From: Dan Morrill <morrildl@google.com>
Date: Wed, 8 Jun 2011 21:58:06 -0700
Subject: 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.

Change-Id: I675af3f3ecfe34a72954ae8241965b0a882edbb8
---
 core/res/res/values/config.xml                                       | 4 ++++
 .../SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index f3cc2bb3f3ce..032ec295101f 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -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>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
index 963b5b2727c4..a9300f36718c 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 @@ 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());
-- 
cgit v1.2.3-59-g8ed1b