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

Commit 9b5ae0ce authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Tuning parameters for mobile RSSI. 

  * Allow phone RSSI to be shown instead of data
  * Allow "3G" to be shown for all sub-4G networks

Change-Id: I0dc61ee039d1065ad6ccd63a2b2420edc62cb62e
parent d939dd2e

packages/SystemUI/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -43,5 +43,11 @@ 
    <!-- How many icons may be shown at once in the system bar. Includes any

         slots that may be reused for things like IME control. -->

    <integer name="config_maxNotificationIcons">5</integer>



    <!-- Show phone (voice) signal strength instead of data in mobile RSSI. -->

    <bool name="config_showPhoneRSSIForData">false</bool>



    <!-- When true, show 1/2G networks as 3G. -->

    <bool name="config_showMin3G">false</bool>

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+37 −16
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ public class NetworkController extends BroadcastReceiver { 
    boolean mDataActive;

    int mMobileActivityIconId; // overlay arrows for data direction

    int mLastSignalLevel;

    boolean mShowPhoneRSSIForData = false;

    boolean mShowAtLeastThreeGees = false;



    String mContentDescriptionPhoneSignal;

    String mContentDescriptionWifi;
@@ -151,11 +153,15 @@ public class NetworkController extends BroadcastReceiver { 
     */

    public NetworkController(Context context) {

        mContext = context;

        final Resources res = context.getResources();



        ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(

                Context.CONNECTIVITY_SERVICE);

        mHasMobileDataFeature = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);



        mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData);

        mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G);



        // set up the default wifi icon, used when no radios have ever appeared

        updateWifiIcons();
@@ -240,7 +246,7 @@ public class NetworkController extends BroadcastReceiver { 
                mContentDescriptionWifi);

        cluster.setMobileDataIndicators(

                mHasMobileDataFeature,

                mPhoneSignalIconId,

                mShowPhoneRSSIForData ? mPhoneSignalIconId : mDataSignalIconId,

                mMobileActivityIconId,

                mDataTypeIconId,

                mContentDescriptionPhoneSignal,
@@ -434,17 +440,25 @@ public class NetworkController extends BroadcastReceiver { 
    private final void updateDataNetType() {

        switch (mDataNetType) {

            case TelephonyManager.NETWORK_TYPE_UNKNOWN:

                if (!mShowAtLeastThreeGees) {

                    mDataIconList = TelephonyIcons.DATA_G[mInetCondition];

                    mDataTypeIconId = 0;

                    mContentDescriptionDataType = mContext.getString(

                            R.string.accessibility_data_connection_gprs);

                    break;

                } else {

                    // fall through

                }

            case TelephonyManager.NETWORK_TYPE_EDGE:

                if (!mShowAtLeastThreeGees) {

                    mDataIconList = TelephonyIcons.DATA_E[mInetCondition];

                    mDataTypeIconId = R.drawable.stat_sys_data_connected_e;

                    mContentDescriptionDataType = mContext.getString(

                            R.string.accessibility_data_connection_edge);

                    break;

                } else {

                    // fall through

                }

            case TelephonyManager.NETWORK_TYPE_UMTS:

                mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];

                mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
@@ -496,10 +510,17 @@ public class NetworkController extends BroadcastReceiver { 
                        R.string.accessibility_data_connection_4g);

                break;

            default:

                if (!mShowAtLeastThreeGees) {

                    mDataIconList = TelephonyIcons.DATA_G[mInetCondition];

                    mDataTypeIconId = R.drawable.stat_sys_data_connected_g;

                    mContentDescriptionDataType = mContext.getString(

                            R.string.accessibility_data_connection_gprs);

                } else {

                    mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];

                    mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;

                    mContentDescriptionDataType = mContext.getString(

                            R.string.accessibility_data_connection_3g);

                }

                break;

        }

        if ((isCdma() && isCdmaEri()) || mPhone.isNetworkRoaming()) {
@@ -877,7 +898,7 @@ public class NetworkController extends BroadcastReceiver { 
                        mContentDescriptionWifi);

                cluster.setMobileDataIndicators(

                        mHasMobileDataFeature,

                        mPhoneSignalIconId,

                        mShowPhoneRSSIForData ? mPhoneSignalIconId : mDataSignalIconId,

                        mMobileActivityIconId,

                        mDataTypeIconId,

                        mContentDescriptionPhoneSignal,