am e20a19cb: Merge "show 3G icon for CDMA/1xRTT" (1971df5d) · Commits · e / os / android_frameworks_base

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

+19 −11

Original line number	Diff line number	Diff line
		@@ -577,18 +577,26 @@ public class NetworkController extends BroadcastReceiver {
		}
		break;
		case TelephonyManager.NETWORK_TYPE_CDMA:
		if (!mShowAtLeastThreeGees) {
		// display 1xRTT for IS95A/B
		mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
		mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
		mContentDescriptionDataType = mContext.getString(
		R.string.accessibility_data_connection_cdma);
		break;
		} else {
		// fall through
		}
		case TelephonyManager.NETWORK_TYPE_1xRTT:
		if (!mShowAtLeastThreeGees) {
		mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
		mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
		mContentDescriptionDataType = mContext.getString(
		R.string.accessibility_data_connection_cdma);
		break;
		} else {
		// fall through
		}
		case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
		case TelephonyManager.NETWORK_TYPE_EVDO_A:
		case TelephonyManager.NETWORK_TYPE_EVDO_B: