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

Commit 44bd61ef authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am f77a7877: am d446dd75: am 446792ba: Merge "The config_show4GForLTe is... 

am f77a7877: am d446dd75: am 446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev

* commit 'f77a7877':
  The config_show4GForLTe is dynamic use latest value.
parents e36b9357 f77a7877

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

+2 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ public class NetworkController extends BroadcastReceiver { 
    boolean mShowPhoneRSSIForData = false;

    boolean mShowAtLeastThreeGees = false;

    boolean mAlwaysShowCdmaRssi = false;

    boolean mShow4GforLTE = false;



    String mContentDescriptionPhoneSignal;

    String mContentDescriptionWifi;
@@ -200,7 +199,6 @@ public class NetworkController extends BroadcastReceiver { 


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

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

        mShow4GforLTE = res.getBoolean(R.bool.config_show4GForLTE);

        mAlwaysShowCdmaRssi = res.getBoolean(

                com.android.internal.R.bool.config_alwaysUseCdmaRssi);
@@ -680,7 +678,8 @@ public class NetworkController extends BroadcastReceiver { 
                            R.string.accessibility_data_connection_3g);

                    break;

                case TelephonyManager.NETWORK_TYPE_LTE:

                    if (mShow4GforLTE) {

                    boolean show4GforLTE = mContext.getResources().getBoolean(R.bool.config_show4GForLTE);

                    if (show4GforLTE) {

                        mDataIconList = TelephonyIcons.DATA_4G[mInetCondition];

                        mDataTypeIconId = R.drawable.stat_sys_data_connected_4g;

                        mQSDataTypeIconId = R.drawable.ic_qs_signal_4g;