Merge "StatusBar: Add support for carrier customizaion by overlay" (5a7d1dc6) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/arrays.xml

+945 −555

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/MSimSignalClusterView.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -220,7 +220,6 @@ public class MSimSignalClusterView
		mNoSimIconId[subscription] = noSimIcon;

		if (showMobileActivity()) {
		mMobileActivityId[subscription] = 0;
		mDataActivityId[subscription] = 0;
		mDataVisible[subscription] = false;
		} else {
		@@ -230,7 +229,7 @@ public class MSimSignalClusterView
		}

		if (mStyle == STATUS_BAR_STYLE_CDMA_1X_COMBINED) {
		if (showBoth3gAnd1x()) {
		if (showBoth3gAnd1x() \|\| getMobileCdma3gId(strengthIcon) != 0) {
		mMobileCdmaVisible = true;
		mMobileCdma1xOnlyVisible = false;

		@@ -279,9 +278,7 @@ public class MSimSignalClusterView
		if (mWifiVisible) {
		mWifiGroup.setVisibility(View.VISIBLE);
		mWifi.setImageResource(mWifiStrengthId);
		if (mStyle != STATUS_BAR_STYLE_ANDROID_DEFAULT) {
		mWifiActivity.setImageResource(mWifiActivityId);
		}
		mWifiGroup.setContentDescription(mWifiDescription);
		} else {
		mWifiGroup.setVisibility(View.GONE);
		@@ -333,7 +330,6 @@ public class MSimSignalClusterView
		mSpacer.setVisibility(View.GONE);
		}
		}

		}

		private void updateMobile(int sub) {

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@ public class SignalClusterView
		mNoSimIconId = noSimIcon;

		if (showMobileActivity()) {
		mMobileActivityId = 0;
		mDataActivityId = 0;
		mDataVisible = false;
		} else {
		@@ -182,7 +181,7 @@ public class SignalClusterView
		}

		if (mStyle == STATUS_BAR_STYLE_CDMA_1X_COMBINED) {
		if (showBoth3gAnd1x()) {
		if (showBoth3gAnd1x() \|\| getMobileCdma3gId(strengthIcon) != 0) {
		mMobileCdmaVisible = true;
		mMobileCdma1xOnlyVisible = false;

		@@ -251,9 +250,7 @@ public class SignalClusterView

		if (mWifiVisible) {
		mWifi.setImageResource(mWifiStrengthId);
		if (mStyle != STATUS_BAR_STYLE_ANDROID_DEFAULT) {
		mWifiActivity.setImageResource(mWifiActivityId);
		}

		mWifiGroup.setContentDescription(mWifiDescription);
		mWifiGroup.setVisibility(View.VISIBLE);

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

+23 −8

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ public class MSimNetworkController extends NetworkController {
		int[] mMSimLastDataTypeIconId;
		int[] mMSimcombinedSignalIconId;
		int[] mMSimcombinedActivityIconId;
		int[] mMSimLastcombinedActivityIconId;
		int[] mMSimLastSimIconId;
		private int mDefaultSubscription;
		boolean[] mShowSpn;
		@@ -138,6 +139,7 @@ public class MSimNetworkController extends NetworkController {
		mMSimLastCombinedSignalIconId = new int[numPhones];
		mMSimcombinedSignalIconId = new int[numPhones];
		mMSimcombinedActivityIconId = new int[numPhones];
		mMSimLastcombinedActivityIconId = new int[numPhones];
		mMSimDataActivity = new int[numPhones];
		mMSimContentDescriptionCombinedSignal = new String[numPhones];
		mMSimContentDescriptionDataType = new String[numPhones];
		@@ -162,6 +164,7 @@ public class MSimNetworkController extends NetworkController {
		mMSimLastCombinedSignalIconId[i] = -1;
		mMSimcombinedSignalIconId[i] = 0;
		mMSimcombinedActivityIconId[i] = 0;
		mMSimLastcombinedActivityIconId[i] = 0;
		mMSimDataActivity[i] = TelephonyManager.DATA_ACTIVITY_NONE;
		mMSimLastSimIconId[i] = 0;
		mMSimNetworkName[i] = mNetworkNameDefault;
		@@ -276,6 +279,8 @@ public class MSimNetworkController extends NetworkController {
		+ getResourceName(mMSimDataSignalIconId[subscription])
		+ " mMSimDataTypeIconId[" + subscription + "]="
		+ getResourceName(mMSimDataTypeIconId[subscription])
		+ " mMSimMobileActivityIconId[" + subscription + "]="
		+ getResourceName(mMSimMobileActivityIconId[subscription])
		+ " mNoMSimIconId[" + subscription + "]="
		+ getResourceName(mNoMSimIconId[subscription]));
		}
		@@ -659,7 +664,9 @@ public class MSimNetworkController extends NetworkController {
		mMSimContentDescriptionDataType[subscription] =
		TelephonyIcons.getDataTypeDesc();
		mQSDataTypeIconId =
		TelephonyIcons.getQSDataTypeIcon();
		TelephonyIcons.getQSDataTypeIcon(subscription);
		Slog.d(TAG, "updateDataNetType, mQSDataTypeIconId = "
		+ getResourceName(mQSDataTypeIconId));
		}
		}

		@@ -709,7 +716,6 @@ public class MSimNetworkController extends NetworkController {

		Slog.d(TAG, "updateIconSet, chosenNetworkType=" + chosenNetworkType
		+ " hspaDataDistinguishable=" + String.valueOf(mHspaDataDistinguishable)
		+ " hspapDistinguishable=" + "false"
		+ " showAtLeastThreeGees=" + String.valueOf(mShowAtLeastThreeGees));

		TelephonyIcons.updateDataType(subscription, chosenNetworkType, mShowAtLeastThreeGees,
		@@ -719,7 +725,7 @@ public class MSimNetworkController extends NetworkController {
		private final void updateSimIcon(int cardIndex) {
		Slog.d(TAG,"In updateSimIcon card =" + cardIndex + ", simState= " + mMSimState[cardIndex]);
		if (mMSimState[cardIndex] == IccCardConstants.State.ABSENT) {
		mNoMSimIconId[cardIndex] = TelephonyIcons.getNoSimIcon();
		mNoMSimIconId[cardIndex] = TelephonyIcons.getNoSimIcon(cardIndex);
		} else {
		mNoMSimIconId[cardIndex] = 0;
		}
		@@ -751,7 +757,8 @@ public class MSimNetworkController extends NetworkController {
		if (mMSimState[subscription] == IccCardConstants.State.READY \|\|
		mMSimState[subscription] == IccCardConstants.State.UNKNOWN) {
		if (mDataState == TelephonyManager.DATA_CONNECTED) {
		iconId = TelephonyIcons.getDataActivity(subscription, mDataActivity);
		iconId = TelephonyIcons.getDataActivity(subscription,
		mMSimDataActivity[subscription]);
		mMSimDataDirectionIconId[subscription] = iconId;
		} else {
		iconId = 0;
		@@ -759,13 +766,14 @@ public class MSimNetworkController extends NetworkController {
		}
		} else {
		Slog.d(TAG,"updateDataIcon when no sim");
		iconId = TelephonyIcons.getNoSimIcon();
		iconId = TelephonyIcons.getNoSimIcon(subscription);
		visible = false; // no SIM? no data
		}
		} else {
		// CDMA case, mMSimDataActivity can be also DATA_ACTIVITY_DORMANT
		if (mDataState == TelephonyManager.DATA_CONNECTED) {
		iconId = TelephonyIcons.getDataActivity(subscription, mDataActivity);
		iconId = TelephonyIcons.getDataActivity(subscription,
		mMSimDataActivity[subscription]);
		} else {
		iconId = 0;
		visible = false;
		@@ -1064,7 +1072,9 @@ public class MSimNetworkController extends NetworkController {
		\|\| mLastWimaxIconId != mWimaxIconId
		\|\| mMSimLastDataTypeIconId[subscription] != mMSimDataTypeIconId[subscription]
		\|\| mLastAirplaneMode != mAirplaneMode
		\|\| mMSimLastSimIconId[subscription] != mNoMSimIconId[subscription])
		\|\| mMSimLastSimIconId[subscription] != mNoMSimIconId[subscription]
		\|\| mMSimLastcombinedActivityIconId[subscription]
		!= mMSimcombinedActivityIconId[subscription])
		{
		// NB: the mLast*s will be updated later
		for (MSimSignalCluster cluster : mSimSignalClusters) {
		@@ -1104,7 +1114,12 @@ public class MSimNetworkController extends NetworkController {
		mMSimcombinedSignalIconId[subscription]) {
		mMSimLastCombinedSignalIconId[subscription] = mMSimcombinedSignalIconId[subscription];
		}

		// the combined data activity icon
		if (mMSimLastcombinedActivityIconId[subscription] !=
		mMSimcombinedActivityIconId[subscription]) {
		mMSimLastcombinedActivityIconId[subscription]
		= mMSimcombinedActivityIconId[subscription];
		}
		// the data network type overlay
		if (mMSimLastDataTypeIconId[subscription] != mMSimDataTypeIconId[subscription]) {
		mMSimLastDataTypeIconId[subscription] = mMSimDataTypeIconId[subscription];

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		int mAirplaneIconId;
		int mNoSimIconId;
		int mLastSimIconId;
		int mLastMobileActivityIconId;
		boolean mDataActive;
		int mLastSignalLevel;
		boolean mShowPhoneRSSIForData = false;
		@@ -1226,7 +1227,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		\|\| mLastDataTypeIconId != mDataTypeIconId
		\|\| mLastAirplaneMode != mAirplaneMode
		\|\| mLastLocale != mLocale
		\|\| mLastSimIconId != mNoSimIconId)
		\|\| mLastSimIconId != mNoSimIconId
		\|\| mLastMobileActivityIconId != mMobileActivityIconId)
		{
		// NB: the mLast*s will be updated later
		for (SignalCluster cluster : mSignalClusters) {
		@@ -1246,6 +1248,9 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		if (mLastPhoneSignalIconId != mPhoneSignalIconId) {
		mLastPhoneSignalIconId = mPhoneSignalIconId;
		}
		if (mLastMobileActivityIconId != mMobileActivityIconId) {
		mLastMobileActivityIconId = mMobileActivityIconId;
		}

		// the data icon on phones
		if (mLastDataDirectionIconId != mDataDirectionIconId) {