TODO's from Teleca with modifications from wink. (f315238a) · Commits · e / os / android_frameworks_base

core/res/res/drawable/stat_sys_vp_phone_call_bluetooth.png

0 → 100644

+815 B

Loading image diff...

core/res/res/values/strings.xml

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -148,6 +148,24 @@
	<!-- Meaning: unknown. Example: Service was enabled for: Voice, PAD -->		<!-- Meaning: unknown. Example: Service was enabled for: Voice, PAD -->
	<string name="serviceClassPAD">PAD</string>		<string name="serviceClassPAD">PAD</string>

			<!-- CDMA Roaming Indicator Strings (non ERI)--> <skip />
			<!-- Default roaming indicator text -->
			<string name="roamingText0">Roaming Indicator On</string>
			<string name="roamingText1">Roaming Indicator Off</string>
			<string name="roamingText2">Roaming Indicator Flashing</string>
			<string name="roamingText3">Out of Neighborhood</string>
			<string name="roamingText4">Out of Building</string>
			<string name="roamingText5">Roaming - Preferred System</string>
			<string name="roamingText6">Roaming - Available System</string>
			<string name="roamingText7">Roaming - Alliance Partner</string>
			<string name="roamingText8">Roaming - Premium Partner</string>
			<string name="roamingText9">Roaming - Full Service Functionality</string>
			<string name="roamingText10">Roaming - Partial Service Functionality</string>
			<string name="roamingText11">Roaming Banner On</string>
			<string name="roamingText12">Roaming Banner Off</string>
			<string name="roamingTextSearching">Searching for Service</string>


	<!--		<!--
	{0} is one of "bearerServiceCode*"		{0} is one of "bearerServiceCode*"
	{1} is dialing number		{1} is dialing number

services/java/com/android/server/status/StatusBarPolicy.java

+6 −22

Original line number	Original line	Diff line number	Diff line
	@@ -840,30 +840,10 @@ public class StatusBarPolicy {
	updateDataIcon();		updateDataIcon();
	}		}

	// TODO(Teleca): I've add isCdma() to reduce some code duplication and simplify.
	// Please validate the correctness of these changes
	private boolean isCdma() {		private boolean isCdma() {
	// Is this equivalent, if so it seems simpler?		return ((mPhone != null) && (mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA));
	// return ((mPhone != null) && (mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA));

	if (mServiceState != null) {
	switch(mServiceState.getRadioTechnology()) {
	case ServiceState.RADIO_TECHNOLOGY_1xRTT:
	case ServiceState.RADIO_TECHNOLOGY_EVDO_0:
	case ServiceState.RADIO_TECHNOLOGY_EVDO_A:
	case ServiceState.RADIO_TECHNOLOGY_IS95A:
	case ServiceState.RADIO_TECHNOLOGY_IS95B:
	return true;
	default:
	return false;
	}
	} else {
	return false;
	}
	}		}

	// TODO(Teleca): I've add hasService() to reduce some code duplication and simplify.
	// Please validate the correctness of these changes.
	private boolean hasService() {		private boolean hasService() {
	if (mServiceState != null) {		if (mServiceState != null) {
	switch (mServiceState.getState()) {		switch (mServiceState.getState()) {
	@@ -1223,10 +1203,12 @@ public class StatusBarPolicy {
	private final void updateCdmaRoamingIcon() {		private final void updateCdmaRoamingIcon() {
	if (!hasService()) {		if (!hasService()) {
	mService.setIconVisibility(mCdmaRoamingIndicatorIcon, false);		mService.setIconVisibility(mCdmaRoamingIndicatorIcon, false);
			return;
	}		}

	if (!isCdma()) {		if (!isCdma()) {
	mService.setIconVisibility(mCdmaRoamingIndicatorIcon, false);		mService.setIconVisibility(mCdmaRoamingIndicatorIcon, false);
			return;
	}		}

	int[] iconList = sRoamingIndicatorImages_cdma;		int[] iconList = sRoamingIndicatorImages_cdma;
	@@ -1256,8 +1238,10 @@ public class StatusBarPolicy {
	mService.setIconVisibility(mCdmaRoamingIndicatorIcon, true);		mService.setIconVisibility(mCdmaRoamingIndicatorIcon, true);
	break;		break;
	case EriInfo.ROAMING_ICON_MODE_FLASH:		case EriInfo.ROAMING_ICON_MODE_FLASH:
	mCdmaRoamingIndicatorIconData.iconId = com.android.internal.R.drawable.stat_sys_roaming_cdma_flash;		mCdmaRoamingIndicatorIconData.iconId =
			com.android.internal.R.drawable.stat_sys_roaming_cdma_flash;
	mService.updateIcon(mCdmaRoamingIndicatorIcon, mCdmaRoamingIndicatorIconData, null);		mService.updateIcon(mCdmaRoamingIndicatorIcon, mCdmaRoamingIndicatorIconData, null);
			mService.setIconVisibility(mCdmaRoamingIndicatorIcon, true);
	break;		break;

	}		}

telephony/java/com/android/internal/telephony/CommandsInterface.java

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1258,10 +1258,7 @@ public interface CommandsInterface {
	* @param result		* @param result
	* Callback message is empty on completion		* Callback message is empty on completion
	*/		*/
	/**		// TODO: Change the configValuesArray to a RIL_BroadcastSMSConfig
	* TODO(Teleca): configValuesArray is represented as a RIL_BroadcastSMSConfig
	* so we think this should be a class with the appropriate parameters not an array?
	*/
	public void setCdmaBroadcastConfig(int[] configValuesArray, Message result);		public void setCdmaBroadcastConfig(int[] configValuesArray, Message result);

	/**		/**

telephony/java/com/android/internal/telephony/PhoneBase.java

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -53,15 +53,6 @@ import java.util.Locale;
	*		*
	*/		*/

	/**
	* TODO(Teleca): This has a multitude of methods that are CDMA specific
	* , (registerForVoicePrivacy, registerCdmaInformationRecord, registerCdmaCallWaiting,
	* setCdmaRoamingPreference, setCdmaSubscription, getCdmaEriIcon, getCdmaEriText, ...) can
	* these type of calls be more abstract. For example CallWaiting is common between the GSM/CDMA
	* it would seem that doesn't need to be cdma specific. Also, should the application be directly
	* dealing with the CdmaInformationRecord's could they be abstracted to something more generic.
	*/

	public abstract class PhoneBase implements Phone {		public abstract class PhoneBase implements Phone {
	private static final String LOG_TAG = "PHONE";		private static final String LOG_TAG = "PHONE";
	private static final boolean LOCAL_DEBUG = true;		private static final boolean LOCAL_DEBUG = true;