SystemUI: Fix data activity arrows for MSIM (0718ab22) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -161,20 +161,23 @@ public class MSimSignalClusterView
		}

		@Override
		public void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription) {
		public void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon,
		String contentDescription) {
		mWifiVisible = visible;
		mWifiStrengthId = strengthIcon;
		mWifiActivityId = activityIcon;
		mWifiDescription = contentDescription;

		applySubscription(MSimTelephonyManager.getDefault().getDefaultSubscription());
		}

		@Override
		public void setMobileDataIndicators(boolean visible, int strengthIcon,
		public void setMobileDataIndicators(boolean visible, int strengthIcon, int activityIcon,
		int typeIcon, String contentDescription, String typeContentDescription,
		int noSimIcon, int subscription) {
		mMobileVisible = visible;
		mMobileStrengthId[subscription] = strengthIcon;
		mMobileActivityId[subscription] = activityIcon;
		mMobileTypeId[subscription] = typeIcon;
		mMobileDescription[subscription] = contentDescription;
		mMobileTypeDescription = typeContentDescription;

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

+78 −20

Original line number	Diff line number	Diff line
		@@ -28,31 +28,22 @@ import android.net.ConnectivityManager;
		import android.net.NetworkInfo;
		import android.net.wifi.WifiManager;
		import android.net.wimax.WimaxManagerConstants;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.Message;
		import android.os.Messenger;
		import android.os.RemoteException;
		import android.os.SystemProperties;
		import android.provider.Settings;
		import android.provider.Telephony;
		import android.telephony.MSimTelephonyManager;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Slog;
		import android.view.View;
		import android.widget.ImageView;
		import android.widget.TextView;

		import com.android.internal.telephony.IccCard;
		import com.android.internal.telephony.IccCardConstants;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.MSimConstants;
		import com.android.internal.telephony.cdma.EriInfo;
		import com.android.internal.util.AsyncChannel;

		import com.android.systemui.R;

		@@ -82,7 +73,7 @@ public class MSimNetworkController extends NetworkController {
		int[] mMSimDataTypeIconId;
		int[] mNoMSimIconId;
		int[] mMSimMobileActivityIconId; // overlay arrows for data direction

		int[] mMSimLastCombinedActivityIconId;
		String[] mMSimContentDescriptionPhoneSignal;
		String[] mMSimContentDescriptionCombinedSignal;
		String[] mMSimContentDescriptionDataType;
		@@ -103,8 +94,9 @@ public class MSimNetworkController extends NetworkController {
		ArrayList<TextView> mSubsLabelViews = new ArrayList<TextView>();

		public interface MSimSignalCluster {
		void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription);
		void setMobileDataIndicators(boolean visible, int strengthIcon,
		void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon,
		String contentDescription);
		void setMobileDataIndicators(boolean visible, int strengthIcon, int activityIcon,
		int typeIcon, String contentDescription, String typeContentDescription,
		int noSimIcon, int subscription);
		void setIsAirplaneMode(boolean is, int airplaneIcon);
		@@ -137,6 +129,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];
		@@ -160,6 +153,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;
		@@ -227,10 +221,12 @@ public class MSimNetworkController extends NetworkController {
		// only show wifi in the cluster if connected or if wifi-only
		mWifiEnabled && (mWifiConnected \|\| !mHasMobileDataFeature),
		mWifiIconId,
		mWifiActivityIconId,
		mContentDescriptionWifi);
		cluster.setMobileDataIndicators(
		mHasMobileDataFeature,
		mMSimPhoneSignalIconId[subscription],
		mMSimMobileActivityIconId[subscription],
		mMSimDataTypeIconId[subscription],
		mMSimContentDescriptionPhoneSignal[subscription],
		mMSimContentDescriptionDataType[subscription],
		@@ -240,6 +236,7 @@ public class MSimNetworkController extends NetworkController {
		cluster.setMobileDataIndicators(
		true,
		mAlwaysShowCdmaRssi ? mPhoneSignalIconId : mWimaxIconId,
		mMSimMobileActivityIconId[subscription],
		mMSimDataTypeIconId[subscription],
		mContentDescriptionWimax,
		mMSimContentDescriptionDataType[subscription],
		@@ -250,6 +247,7 @@ public class MSimNetworkController extends NetworkController {
		mHasMobileDataFeature,
		mShowPhoneRSSIForData ? mMSimPhoneSignalIconId[subscription]
		: mMSimDataSignalIconId[subscription],
		mMSimMobileActivityIconId[subscription],
		mMSimDataTypeIconId[subscription],
		mMSimContentDescriptionPhoneSignal[subscription],
		mMSimContentDescriptionDataType[subscription],
		@@ -1004,7 +1002,20 @@ public class MSimNetworkController extends NetworkController {
		// Now for things that should only be shown when actually using mobile data.
		if (mMSimDataConnected[subscription]) {
		mMSimcombinedSignalIconId[subscription] = mMSimDataSignalIconId[subscription];

		switch (mMSimDataActivity[subscription]) {
		case TelephonyManager.DATA_ACTIVITY_IN:
		mMSimMobileActivityIconId[subscription] = R.drawable.stat_sys_signal_in;
		break;
		case TelephonyManager.DATA_ACTIVITY_OUT:
		mMSimMobileActivityIconId[subscription] = R.drawable.stat_sys_signal_out;
		break;
		case TelephonyManager.DATA_ACTIVITY_INOUT:
		mMSimMobileActivityIconId[subscription] = R.drawable.stat_sys_signal_inout;
		break;
		default:
		mMSimMobileActivityIconId[subscription] = R.drawable.stat_sys_signal_noinout;
		break;
		}
		combinedLabel = mobileLabel;
		mMSimcombinedActivityIconId[subscription] = mMSimMobileActivityIconId[subscription];
		// set by updateDataIcon()
		@@ -1020,13 +1031,29 @@ public class MSimNetworkController extends NetworkController {
		if (mWifiSsid == null) {
		wifiLabel = context.getString(
		R.string.status_bar_settings_signal_meter_wifi_nossid);
		mWifiActivityIconId = 0; // no wifis, no bits
		} else {
		wifiLabel = mWifiSsid;
		if (DEBUG) {
		wifiLabel += "xxxxXXXXxxxxXXXX";
		}
		switch (mWifiActivity) {
		case WifiManager.DATA_ACTIVITY_IN:
		mWifiActivityIconId = R.drawable.stat_sys_wifi_in;
		break;
		case WifiManager.DATA_ACTIVITY_OUT:
		mWifiActivityIconId = R.drawable.stat_sys_wifi_out;
		break;
		case WifiManager.DATA_ACTIVITY_INOUT:
		mWifiActivityIconId = R.drawable.stat_sys_wifi_inout;
		break;
		case WifiManager.DATA_ACTIVITY_NONE:
		mWifiActivityIconId = R.drawable.stat_sys_wifi_noinout;
		break;
		}
		}
		combinedLabel = wifiLabel;
		mMSimcombinedActivityIconId[subscription] = mWifiActivityIconId;
		mMSimcombinedSignalIconId[subscription] = mWifiIconId; // set by updateWifiIcons()
		mMSimContentDescriptionCombinedSignal[subscription] = mContentDescriptionWifi;
		} else {
		@@ -1048,8 +1075,8 @@ public class MSimNetworkController extends NetworkController {
		final boolean ethernetConnected = (mConnectedNetworkType ==
		ConnectivityManager.TYPE_ETHERNET);
		if (ethernetConnected) {
		// TODO: icons and strings for Ethernet connectivity
		combinedLabel = mConnectedNetworkTypeName;
		mContentDescriptionEthernet = combinedLabel = mContext.getString(
		R.string.ethernet_label);
		}

		if (mAirplaneMode &&
		@@ -1172,21 +1199,24 @@ 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) {
		refreshSignalCluster(cluster, subscription);
		}
		for (NetworkSignalChangedCallback cb : mSignalsChangedCallbacks) {
		notifySignalsChangedCallbacks(cb);
		}
		}

		if (mLastAirplaneMode != mAirplaneMode) {
		mLastAirplaneMode = mAirplaneMode;
		}

		if (mLastLocale != mLocale) {
		mLastLocale = mLocale;
		}

		// the phone icon on phones
		if (mMSimLastPhoneSignalIconId[subscription] != mMSimPhoneSignalIconId[subscription]) {
		mMSimLastPhoneSignalIconId[subscription] = mMSimPhoneSignalIconId[subscription];
		@@ -1215,6 +1245,17 @@ 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 ethernet icon
		if (mLastEthernetIconId != mEthernetIconId) {
		mLastEthernetIconId = mEthernetIconId;
		}

		// the data network type overlay
		if (mMSimLastDataTypeIconId[subscription] != mMSimDataTypeIconId[subscription]) {
		@@ -1255,6 +1296,23 @@ public class MSimNetworkController extends NetworkController {
		v.setVisibility(View.VISIBLE);
		}
		}

		// e-call label
		N = mEmergencyLabelViews.size();
		for (int i=0; i<N; i++) {
		TextView v = mEmergencyLabelViews.get(i);
		if (!mMSimServiceState[subscription].isEmergencyOnly()) {
		v.setVisibility(View.GONE);
		} else {
		v.setText(mobileLabel); // comes from the telephony stack
		v.setVisibility(View.VISIBLE);
		}
		}

		// Update the dependency UI
		if (mUpdateUIListener != null) {
		mUpdateUIListener.onUpdateUI();
		}
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args, int subscription) {

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -140,13 +140,13 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		protected boolean mAirplaneMode = false;
		protected boolean mLastAirplaneMode = true;

		private Locale mLocale = null;
		private Locale mLastLocale = null;
		protected Locale mLocale = null;
		protected Locale mLastLocale = null;

		//ethernet
		private boolean mEthernetConnected = false;
		private int mEthernetIconId = 0;
		private int mLastEthernetIconId = 0;
		protected int mEthernetIconId = 0;
		protected int mLastEthernetIconId = 0;

		// our ui
		protected Context mContext;
		@@ -179,7 +179,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {

		boolean mDataAndWifiStacked = false;

		private UpdateUIListener mUpdateUIListener = null;
		protected UpdateUIListener mUpdateUIListener = null;

		public interface SignalCluster {
		void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon,