diff options
| author | Dan Morrill <morrildl@google.com> | 2011-06-09 14:43:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-09 14:43:58 -0700 |
| commit | a1a107b8cb8cbb7eea796f375eb72958e8b148e3 (patch) | |
| tree | 765388cc4b7bf0ad8cb04924951c8e6a92d667ce | |
| parent | a02d9bf9c3ff22cd449da21ff7c23170488ebd8e (diff) | |
| parent | e33fc82cc9804ed74cdcc8e3b2529bb75ef0ec69 (diff) | |
| download | base-a1a107b8cb8cbb7eea796f375eb72958e8b148e3.tar.gz | |
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
| -rwxr-xr-x | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java | 5 |
2 files changed, 8 insertions, 1 deletions
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()); |