resolved conflicts for merge of b9470f3a to master (5c7daaf7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -97,9 +97,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
		state.icon = ResourceIcon.get(iconId);
		state.isOverlayIconWide = cb.isDataTypeIconWide;
		state.autoMirrorDrawable = !cb.noSim;
		state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) && !cb.wifiConnected
		? cb.dataTypeIconId
		: 0;
		state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) ? cb.dataTypeIconId : 0;
		state.filter = iconId != R.drawable.ic_qs_no_sim;
		state.activityIn = cb.enabled && cb.activityIn;
		state.activityOut = cb.enabled && cb.activityOut;

+5 −4

Original line number	Diff line number	Diff line
		@@ -239,10 +239,13 @@ public class MobileSignalController extends SignalController<

		String contentDescription = getStringIfExists(getContentDescription());
		String dataContentDescription = getStringIfExists(icons.mDataContentDescription);

		boolean showDataIcon = mCurrentState.dataConnected && mCurrentState.inetForNetwork != 0
		\|\| mCurrentState.iconGroup == TelephonyIcons.ROAMING;

		// Only send data sim callbacks to QS.
		if (mCurrentState.dataSim) {
		int qsTypeIcon = mCurrentState.dataConnected ?
		icons.mQsDataType[mCurrentState.inetForNetwork] : 0;
		int qsTypeIcon = showDataIcon ? icons.mQsDataType[mCurrentState.inetForNetwork] : 0;
		int length = mSignalsChangedCallbacks.size();
		for (int i = 0; i < length; i++) {
		mSignalsChangedCallbacks.get(i).onMobileDataSignalChanged(mCurrentState.enabled
		@@ -257,8 +260,6 @@ public class MobileSignalController extends SignalController<
		icons.mIsWide && qsTypeIcon != 0);
		}
		}
		boolean showDataIcon = mCurrentState.dataConnected && mCurrentState.inetForNetwork != 0
		\|\| mCurrentState.iconGroup == TelephonyIcons.ROAMING;
		int typeIcon = showDataIcon ? icons.mDataType : 0;
		int signalClustersLength = mSignalClusters.size();
		for (int i = 0; i < signalClustersLength; i++) {