Merge "MSIM: Retrieve the QS Data icon through PhoneId" (4ff9ff1e) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -800,9 +800,9 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl {
		mMSimDataTypeIconId[phoneId] =
		TelephonyIcons.getDataTypeIcon(phoneId);
		mMSimContentDescriptionDataType[phoneId] =
		TelephonyIcons.getDataTypeDesc();
		TelephonyIcons.getDataTypeDesc(phoneId);
		mQSDataTypeIconId =
		TelephonyIcons.getQSDataTypeIcon();
		TelephonyIcons.getQSDataTypeIcon(phoneId);
		}
		}

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

+25 −17

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ class TelephonyIcons {

		static int[] mSelectedDataTypeIcon;
		static int[] mSelectedQSDataTypeIcon;
		static String mSelectedDataTypeDesc;
		static String[] mSelectedDataTypeDesc;
		static int[] mSelectedDataActivityIndex;
		static int[] mSelectedSignalStreagthIndex;

		@@ -292,6 +292,10 @@ class TelephonyIcons {
		&& mDataTypeArray.length != 0) {
		mSelectedQSDataTypeIcon = new int[mDataTypeArray.length];
		}
		if (mSelectedDataTypeDesc == null
		&& mDataTypeArray.length != 0) {
		mSelectedDataTypeDesc = new String[mDataTypeArray.length];
		}
		if (mSelectedDataActivityIndex == null
		&& mDataActivityArray.length != 0) {
		mSelectedDataActivityIndex = new int[mDataActivityArray.length];
		@@ -360,7 +364,7 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = 0;
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedDataActivityIndex[sub] = 0;
		mSelectedSignalStreagthIndex[sub] = 0;
		break;
		@@ -372,7 +376,7 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_E[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedDataActivityIndex[sub] = DATA_TYPE_E;
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_E;
		break;
		@@ -385,7 +389,7 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_3G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_UMTS;
		break;
		case TelephonyManager.NETWORK_TYPE_HSDPA:
		@@ -396,14 +400,14 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_H[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_H;
		} else {
		mSelectedDataActivityIndex[sub] = DATA_TYPE_3G;
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		mDataTypeGenerationArray[0], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_3G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeGenerationDescArray[0];
		mSelectedDataTypeDesc[sub] = mDataTypeGenerationDescArray[0];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_3G;

		}
		@@ -414,14 +418,14 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_H[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_HP;
		} else {
		mSelectedDataActivityIndex[sub] = DATA_TYPE_3G;
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		mDataTypeGenerationArray[0], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_3G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeGenerationDescArray[0];
		mSelectedDataTypeDesc[sub] = mDataTypeGenerationDescArray[0];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_3G;

		}
		@@ -432,7 +436,7 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_1X[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_CDMA;
		break;
		} else {
		@@ -444,7 +448,7 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_1X[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_1X;
		break;
		} else {
		@@ -458,7 +462,7 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_3G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_3G;
		break;
		case TelephonyManager.NETWORK_TYPE_LTE:
		@@ -467,14 +471,14 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		mDataTypeGenerationArray[1], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_4G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeGenerationDescArray[1];
		mSelectedDataTypeDesc[sub] = mDataTypeGenerationDescArray[1];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_4G;
		} else {
		mSelectedDataActivityIndex[sub] = DATA_TYPE_LTE;
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_LTE[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_4G;
		}
		break;
		@@ -485,14 +489,14 @@ class TelephonyIcons {
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		dataTypeArray[type], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeDescriptionArray[type];
		mSelectedDataTypeDesc[sub] = mDataTypeDescriptionArray[type];
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_G;
		} else {
		mSelectedDataActivityIndex[sub] = DATA_TYPE_3G;
		mSelectedDataTypeIcon[sub] = mRes.getIdentifier(
		mDataTypeGenerationArray[0], null, NS);
		mSelectedQSDataTypeIcon[sub] = QS_DATA_3G[inetCondition];
		mSelectedDataTypeDesc = mDataTypeGenerationDescArray[0];;
		mSelectedDataTypeDesc[sub] = mDataTypeGenerationDescArray[0];;
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_3G;
		}
		break;
		@@ -500,7 +504,7 @@ class TelephonyIcons {
		mSelectedDataActivityIndex[sub] = DATA_TYPE_UNKNOWN;
		mSelectedDataTypeIcon[sub] = 0;
		mSelectedQSDataTypeIcon[sub] = 0;
		mSelectedDataTypeDesc = "";
		mSelectedDataTypeDesc[sub] = "";
		mSelectedSignalStreagthIndex[sub] = SIGNAL_STRENGTH_TYPE_G;
		break;
		}
		@@ -528,7 +532,11 @@ class TelephonyIcons {
		}

		static String getDataTypeDesc() {
		return mSelectedDataTypeDesc;
		return mSelectedDataTypeDesc[DEFAULT_SUB];
		}

		static String getDataTypeDesc(int sub) {
		return mSelectedDataTypeDesc[sub];
		}

		static int getDataActivity(int activity){