Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev

Browse Source
This commit is contained in:
Wink Saville
2013-06-21 15:43:56 +00:00
committed by Android (Google) Code Review
parent 9233fc0023 c06462c1ad
commit 446792ba75
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,6 @@ public class NetworkController extends BroadcastReceiver {
boolean mShowPhoneRSSIForData = false; boolean mShowPhoneRSSIForData = false;
boolean mShowAtLeastThreeGees = false; boolean mShowAtLeastThreeGees = false;
boolean mAlwaysShowCdmaRssi = false; boolean mAlwaysShowCdmaRssi = false;
boolean mShow4GforLTE = false;
String mContentDescriptionPhoneSignal; String mContentDescriptionPhoneSignal;
String mContentDescriptionWifi; String mContentDescriptionWifi;
@@ -200,7 +199,6 @@ public class NetworkController extends BroadcastReceiver {
mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData); mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData);
mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G); mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G);
mShow4GforLTE = res.getBoolean(R.bool.config_show4GForLTE);
mAlwaysShowCdmaRssi = res.getBoolean( mAlwaysShowCdmaRssi = res.getBoolean(
com.android.internal.R.bool.config_alwaysUseCdmaRssi); com.android.internal.R.bool.config_alwaysUseCdmaRssi);
@@ -680,7 +678,8 @@ public class NetworkController extends BroadcastReceiver {
R.string.accessibility_data_connection_3g); R.string.accessibility_data_connection_3g);
break; break;
case TelephonyManager.NETWORK_TYPE_LTE: case TelephonyManager.NETWORK_TYPE_LTE:
if (mShow4GforLTE) { boolean show4GforLTE = mContext.getResources().getBoolean(R.bool.config_show4GForLTE);
if (show4GforLTE) {
mDataIconList = TelephonyIcons.DATA_4G[mInetCondition]; mDataIconList = TelephonyIcons.DATA_4G[mInetCondition];
mDataTypeIconId = R.drawable.stat_sys_data_connected_4g; mDataTypeIconId = R.drawable.stat_sys_data_connected_4g;
mQSDataTypeIconId = R.drawable.ic_qs_signal_4g; mQSDataTypeIconId = R.drawable.ic_qs_signal_4g;