Skip to content

Commit b046b20

Browse files
Madan AnkapuraThe Android Automerger
authored andcommitted
show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69 Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
1 parent f959d10 commit b046b20

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -566,18 +566,26 @@ private final void updateDataNetType() {
566566
}
567567
break;
568568
case TelephonyManager.NETWORK_TYPE_CDMA:
569-
// display 1xRTT for IS95A/B
570-
mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
571-
mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
572-
mContentDescriptionDataType = mContext.getString(
573-
R.string.accessibility_data_connection_cdma);
574-
break;
569+
if (!mShowAtLeastThreeGees) {
570+
// display 1xRTT for IS95A/B
571+
mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
572+
mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
573+
mContentDescriptionDataType = mContext.getString(
574+
R.string.accessibility_data_connection_cdma);
575+
break;
576+
} else {
577+
// fall through
578+
}
575579
case TelephonyManager.NETWORK_TYPE_1xRTT:
576-
mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
577-
mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
578-
mContentDescriptionDataType = mContext.getString(
579-
R.string.accessibility_data_connection_cdma);
580-
break;
580+
if (!mShowAtLeastThreeGees) {
581+
mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
582+
mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
583+
mContentDescriptionDataType = mContext.getString(
584+
R.string.accessibility_data_connection_cdma);
585+
break;
586+
} else {
587+
// fall through
588+
}
581589
case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
582590
case TelephonyManager.NETWORK_TYPE_EVDO_A:
583591
case TelephonyManager.NETWORK_TYPE_EVDO_B:

0 commit comments

Comments
 (0)