Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1a107b8 authored by Dan Morrill's avatar Dan Morrill Committed by Android (Google) Code Review
Browse files

Merge "Adding a new config value used to tell StatusBarPolicy to always use... 

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
parents a02d9bf9 e33fc82c

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

+4 −1
Original line number Diff line number Diff line
@@ -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());