resolved conflicts for merge of 9c43fffc to master (fcec46b3) · Commits · e / os / android_frameworks_base

api/current.xml

+77 −1

Original line number	Diff line number	Diff line
		@@ -147962,7 +147962,7 @@
		visibility="public"
		>
		</field>
		<field name="TYPE_MAINDEN_NAME"
		<field name="TYPE_MAIDEN_NAME"
		type="int"
		transient="false"
		volatile="false"
		@@ -147973,6 +147973,17 @@
		visibility="public"
		>
		</field>
		<field name="TYPE_MAINDEN_NAME"
		type="int"
		transient="false"
		volatile="false"
		value="3"
		static="true"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		<field name="TYPE_OTHER_NAME"
		type="int"
		transient="false"
		@@ -148728,8 +148739,40 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.provider.ContactsContract.CommonDataKinds.CommonColumns">
		</implements>
		<implements name="android.provider.ContactsContract.DataColumnsWithJoins">
		</implements>
		<method name="getTypeLabel"
		return="java.lang.CharSequence"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="res" type="android.content.res.Resources">
		</parameter>
		<parameter name="type" type="int">
		</parameter>
		<parameter name="label" type="java.lang.CharSequence">
		</parameter>
		</method>
		<method name="getTypeLabelResource"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="type" type="int">
		</parameter>
		</method>
		<field name="CONTENT_ITEM_TYPE"
		type="java.lang.String"
		transient="false"
		@@ -148752,6 +148795,39 @@
		visibility="public"
		>
		</field>
		<field name="TYPE_HOME"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TYPE_OTHER"
		type="int"
		transient="false"
		volatile="false"
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TYPE_WORK"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ContactsContract.CommonDataKinds.StructuredName"
		extends="java.lang.Object"

core/java/android/provider/ContactsContract.java

+59 −10

Original line number	Diff line number	Diff line
		@@ -4020,7 +4020,7 @@ public final class ContactsContract {
		* <li>{@link #TYPE_CUSTOM}. Put the actual type in {@link #LABEL}.</li>
		* <li>{@link #TYPE_DEFAULT}</li>
		* <li>{@link #TYPE_OTHER_NAME}</li>
		* <li>{@link #TYPE_MAINDEN_NAME}</li>
		* <li>{@link #TYPE_MAIDEN_NAME}</li>
		* <li>{@link #TYPE_SHORT_NAME}</li>
		* <li>{@link #TYPE_INITIALS}</li>
		* </ul>
		@@ -4046,6 +4046,9 @@ public final class ContactsContract {

		public static final int TYPE_DEFAULT = 1;
		public static final int TYPE_OTHER_NAME = 2;
		public static final int TYPE_MAIDEN_NAME = 3;
		/** @deprecated Use TYPE_MAIDEN_NAME instead. */
		@Deprecated
		public static final int TYPE_MAINDEN_NAME = 3;
		public static final int TYPE_SHORT_NAME = 4;
		public static final int TYPE_INITIALS = 5;
		@@ -5357,17 +5360,30 @@ public final class ContactsContract {
		* <td>{@link #DATA1}</td>
		* <td></td>
		* </tr>
		* <tr>
		* <td>int</td>
		* <td>{@link #TYPE}</td>
		* <td>{@link #DATA2}</td>
		* <td>Allowed values are:
		* <p>
		* <ul>
		* <li>{@link #TYPE_CUSTOM}. Put the actual type in {@link #LABEL}.</li>
		* <li>{@link #TYPE_HOME}</li>
		* <li>{@link #TYPE_WORK}</li>
		* <li>{@link #TYPE_OTHER}</li>
		* </ul>
		* </p>
		* </td>
		* </tr>
		* <tr>
		* <td>String</td>
		* <td>{@link #LABEL}</td>
		* <td>{@link #DATA3}</td>
		* <td></td>
		* </tr>
		* </table>
		*/
		public static final class SipAddress implements DataColumnsWithJoins {
		// TODO: Ultimately this class will probably implement
		// CommonColumns too (in addition to DataColumnsWithJoins)
		// since it may make sense to have multiple SIP addresses with
		// different types+labels, just like with phone numbers.
		//
		// But that can be extended in the future without breaking any
		// public API, so let's keep this class ultra-simple for now.

		public static final class SipAddress implements DataColumnsWithJoins, CommonColumns {
		/**
		* This utility class cannot be instantiated
		*/
		@@ -5376,11 +5392,44 @@ public final class ContactsContract {
		/** MIME type used when storing this in data table. */
		public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address";

		public static final int TYPE_HOME = 1;
		public static final int TYPE_WORK = 2;
		public static final int TYPE_OTHER = 3;

		/**
		* The SIP address.
		* <P>Type: TEXT</P>
		*/
		public static final String SIP_ADDRESS = DATA1;
		// ...and TYPE and LABEL come from the CommonColumns interface.

		/**
		* Return the string resource that best describes the given
		* {@link #TYPE}. Will always return a valid resource.
		*/
		public static final int getTypeLabelResource(int type) {
		switch (type) {
		case TYPE_HOME: return com.android.internal.R.string.sipAddressTypeHome;
		case TYPE_WORK: return com.android.internal.R.string.sipAddressTypeWork;
		case TYPE_OTHER: return com.android.internal.R.string.sipAddressTypeOther;
		default: return com.android.internal.R.string.sipAddressTypeCustom;
		}
		}

		/**
		* Return a {@link CharSequence} that best describes the given type,
		* possibly substituting the given {@link #LABEL} value
		* for {@link #TYPE_CUSTOM}.
		*/
		public static final CharSequence getTypeLabel(Resources res, int type,
		CharSequence label) {
		if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) {
		return label;
		} else {
		final int labelRes = getTypeLabelResource(type);
		return res.getText(labelRes);
		}
		}
		}
		}

core/res/res/values/strings.xml

+10 −1

Original line number	Diff line number	Diff line
		@@ -1390,7 +1390,7 @@
		<!-- Other IM address type -->
		<string name="imTypeOther">Other</string>

		<!-- Custom IM address type -->
		<!-- Custom IM protocol type -->
		<string name="imProtocolCustom">Custom</string>
		<!-- AIM IM protocol type -->
		<string name="imProtocolAim">AIM</string>
		@@ -1418,6 +1418,15 @@
		<!-- Custom organization type -->
		<string name="orgTypeCustom">Custom</string>

		<!-- Custom SIP address type -->
		<string name="sipAddressTypeCustom">Custom</string>
		<!-- Home SIP address type -->
		<string name="sipAddressTypeHome">Home</string>
		<!-- Work SIP address type -->
		<string name="sipAddressTypeWork">Work</string>
		<!-- Other SIP address type -->
		<string name="sipAddressTypeOther">Other</string>

		<!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
		Displayed in one line in a large font. -->
		<string name="keyguard_password_enter_pin_code">Enter PIN code</string>