Merge "msim: Add support for H+ icons" into cm-11.0 (27b06f1c) · Commits · e / os / android_frameworks_base

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -631,7 +631,6 @@ public class MSimNetworkController extends NetworkController {
		case TelephonyManager.NETWORK_TYPE_HSDPA:
		case TelephonyManager.NETWORK_TYPE_HSUPA:
		case TelephonyManager.NETWORK_TYPE_HSPA:
		case TelephonyManager.NETWORK_TYPE_HSPAP:
		if (mHspaDataDistinguishable) {
		mDataIconList = TelephonyIcons.DATA_H[mInetCondition];
		mMSimDataTypeIconId[subscription] =
		@@ -646,6 +645,21 @@ public class MSimNetworkController extends NetworkController {
		R.string.accessibility_data_connection_3g);
		}
		break;
		case TelephonyManager.NETWORK_TYPE_HSPAP:
		if (mHspaDataDistinguishable) {
		mDataIconList = TelephonyIcons.DATA_HP[mInetCondition];
		mMSimDataTypeIconId[subscription] =
		R.drawable.stat_sys_data_fully_connected_hp;
		mMSimContentDescriptionDataType[subscription] = mContext.getString(
		R.string.accessibility_data_connection_HP);
		} else {
		mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
		mMSimDataTypeIconId[subscription] =
		R.drawable.stat_sys_data_fully_connected_3g;
		mMSimContentDescriptionDataType[subscription] = mContext.getString(
		R.string.accessibility_data_connection_3g);
		}
		break;
		case TelephonyManager.NETWORK_TYPE_CDMA:
		// display 1xRTT for IS95A/B
		mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];