Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev (b2e3b744) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,8 @@
		<string-array name="wfcOperatorErrorNotificationMessages" />
		<!-- Template for showing cellular network operator name while WFC is active -->
		<string name="wfcSpnFormat">%s</string>
		<!-- Template for showing operator name for data connection while WFC is active -->
		<string name="wfcDataSpnFormat">%s</string>
		<!-- WFC, summary for Disabled -->
		<string name="wifi_calling_off_summary">Off</string>
		<!-- WFC, summary for Wi-Fi Preferred -->

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -773,6 +773,7 @@
		<java-symbol type="array" name="wfcOperatorErrorAlertMessages" />
		<java-symbol type="array" name="wfcOperatorErrorNotificationMessages" />
		<java-symbol type="string" name="wfcSpnFormat" />
		<java-symbol type="string" name="wfcDataSpnFormat" />
		<java-symbol type="string" name="wifi_calling_off_summary" />
		<java-symbol type="string" name="wfc_mode_wifi_preferred_summary" />
		<java-symbol type="string" name="wfc_mode_cellular_preferred_summary" />

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		usage.warningLevel = DEFAULT_WARNING_LEVEL;
		}
		if (usage != null) {
		usage.carrier = mNetworkController.getMobileNetworkName();
		usage.carrier = mNetworkController.getMobileDataNetworkName();
		}
		return usage;
		} catch (RemoteException e) {

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

+23 −2

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ public class MobileSignalController extends SignalController<
		mapIconSets();

		mLastState.networkName = mCurrentState.networkName = mNetworkNameDefault;
		mLastState.networkNameData = mCurrentState.networkNameData = mNetworkNameDefault;
		mLastState.enabled = mCurrentState.enabled = hasMobileData;
		mLastState.iconGroup = mCurrentState.iconGroup = mDefaultIcons;
		// Get initial data sim state.
		@@ -294,6 +295,7 @@ public class MobileSignalController extends SignalController<
		if (action.equals(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION)) {
		updateNetworkName(intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_SPN, false),
		intent.getStringExtra(TelephonyIntents.EXTRA_SPN),
		intent.getStringExtra(TelephonyIntents.EXTRA_DATA_SPN),
		intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_PLMN, false),
		intent.getStringExtra(TelephonyIntents.EXTRA_PLMN));
		notifyListenersIfNecessary();
		@@ -322,14 +324,18 @@ public class MobileSignalController extends SignalController<
		/**
		* Updates the network's name based on incoming spn and plmn.
		*/
		void updateNetworkName(boolean showSpn, String spn, boolean showPlmn, String plmn) {
		void updateNetworkName(boolean showSpn, String spn, String dataSpn,
		boolean showPlmn, String plmn) {
		if (CHATTY) {
		Log.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn
		Log.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn
		+ " spn=" + spn + " dataSpn=" + dataSpn
		+ " showPlmn=" + showPlmn + " plmn=" + plmn);
		}
		StringBuilder str = new StringBuilder();
		StringBuilder strData = new StringBuilder();
		if (showPlmn && plmn != null) {
		str.append(plmn);
		strData.append(plmn);
		}
		if (showSpn && spn != null) {
		if (str.length() != 0) {
		@@ -342,6 +348,17 @@ public class MobileSignalController extends SignalController<
		} else {
		mCurrentState.networkName = mNetworkNameDefault;
		}
		if (showSpn && dataSpn != null) {
		if (strData.length() != 0) {
		strData.append(mNetworkNameSeparator);
		}
		strData.append(dataSpn);
		}
		if (strData.length() != 0) {
		mCurrentState.networkNameData = strData.toString();
		} else {
		mCurrentState.networkNameData = mNetworkNameDefault;
		}
		}

		/**
		@@ -492,6 +509,7 @@ public class MobileSignalController extends SignalController<

		static class MobileState extends SignalController.State {
		String networkName;
		String networkNameData;
		boolean dataSim;
		boolean dataConnected;
		boolean isEmergency;
		@@ -505,6 +523,7 @@ public class MobileSignalController extends SignalController<
		MobileState state = (MobileState) s;
		dataSim = state.dataSim;
		networkName = state.networkName;
		networkNameData = state.networkNameData;
		dataConnected = state.dataConnected;
		inetForNetwork = state.inetForNetwork;
		isEmergency = state.isEmergency;
		@@ -518,6 +537,7 @@ public class MobileSignalController extends SignalController<
		builder.append(',');
		builder.append("dataSim=").append(dataSim).append(',');
		builder.append("networkName=").append(networkName).append(',');
		builder.append("networkNameData=").append(networkNameData).append(',');
		builder.append("dataConnected=").append(dataConnected).append(',');
		builder.append("inetForNetwork=").append(inetForNetwork).append(',');
		builder.append("isEmergency=").append(isEmergency).append(',');
		@@ -529,6 +549,7 @@ public class MobileSignalController extends SignalController<
		public boolean equals(Object o) {
		return super.equals(o)
		&& Objects.equals(((MobileState) o).networkName, networkName)
		&& Objects.equals(((MobileState) o).networkNameData, networkNameData)
		&& ((MobileState) o).dataSim == dataSim
		&& ((MobileState) o).dataConnected == dataConnected
		&& ((MobileState) o).isEmergency == isEmergency

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -246,9 +246,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
		return mDefaultSignalController;
		}

		public String getMobileNetworkName() {
		public String getMobileDataNetworkName() {
		MobileSignalController controller = getDataController();
		return controller != null ? controller.getState().networkName : "";
		return controller != null ? controller.getState().networkNameData : "";
		}

		public boolean isEmergencyOnly() {