Merge branch 'eclair' into eclair-release (be5a7b9c) · Commits · e / os / android_frameworks_base

api/current.xml

+77 −0

Original line number	Diff line number	Diff line
		@@ -6389,6 +6389,72 @@
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleSmallWindowLarge"
		type="int"
		transient="false"
		volatile="false"
		value="16843443"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleSmallWindowMedium"
		type="int"
		transient="false"
		volatile="false"
		value="16843442"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleSmallWindowSmall"
		type="int"
		transient="false"
		volatile="false"
		value="16843441"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleWindowLarge"
		type="int"
		transient="false"
		volatile="false"
		value="16843440"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleWindowMedium"
		type="int"
		transient="false"
		volatile="false"
		value="16843439"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleWindowSmall"
		type="int"
		transient="false"
		volatile="false"
		value="16843438"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="radioButtonStyle"
		type="int"
		transient="false"
		@@ -158042,6 +158108,17 @@
		visibility="public"
		>
		</method>
		<method name="isOpaque"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="isPaddingOffsetRequired"
		return="boolean"
		abstract="false"

core/java/android/app/SearchManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -330,8 +330,8 @@ import java.util.List;
		* you'll need to update your searchable activity (or other activities) to receive the intents
		* as you've defined them.</li>
		* <li>Implement a Content Provider that provides suggestions. If you already have one, and it
		* has access to your suggestions data. If not, you'll have to create one.
		* You'll also provide information about your Content Provider in your
		* has access to your suggestions data, you can use that provider. If not, you'll have to create
		* one. You'll also provide information about your Content Provider in your
		* package's <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest</a>.</li>
		* <li>Update your searchable activity's XML configuration file. There are two categories of
		* information used for suggestions:
		@@ -1181,7 +1181,7 @@ import java.util.List;
		* Bundle appData = new Bundle();
		* appData.put...();
		* appData.put...();
		* startSearch(null, false, appData);
		* startSearch(null, false, appData, false);
		* return true;
		* }</pre>
		*

core/java/android/hardware/Sensor.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -46,13 +46,21 @@ public class Sensor {

		/** A constant describing a gyroscope sensor type */
		public static final int TYPE_GYROSCOPE = 4;
		/** A constant describing a light sensor type */
		/**
		* A constant describing an light sensor type.
		* See {@link android.hardware.SensorEvent SensorEvent}
		* for more details.
		*/
		public static final int TYPE_LIGHT = 5;
		/** A constant describing a pressure sensor type */
		public static final int TYPE_PRESSURE = 6;
		/** A constant describing a temperature sensor type */
		public static final int TYPE_TEMPERATURE = 7;
		/** A constant describing a proximity sensor type */
		/**
		* A constant describing an proximity sensor type.
		* See {@link android.hardware.SensorEvent SensorEvent}
		* for more details.
		*/
		public static final int TYPE_PROXIMITY = 8;

core/java/android/hardware/SensorEvent.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -116,6 +116,17 @@ public class SensorEvent {
		* All values are in micro-Tesla (uT) and measure the ambient magnetic
		* field in the X, Y and Z axis.
		*
		* <p>{@link android.hardware.Sensor#TYPE_LIGHT Sensor.TYPE_LIGHT}:<p>
		*
		* <p>values[0]: Ambient light level in SI lux units
		*
		* <p>{@link android.hardware.Sensor#TYPE_PROXIMITY Sensor.TYPE_PROXIMITY}:<p>
		*
		* <p>values[0]: Proximity sensor distance measured in centimeters
		*
		* <p> Note that some proximity sensors only support a binary "close" or "far" measurement.
		* In this case, the sensor should report its maxRange value in the "far" state and a value
		* less than maxRange in the "near" state.
		*/
		public final float[] values;

core/java/android/pim/vcard/VCardComposer.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -313,6 +313,8 @@ public class VCardComposer {

		private boolean mIsCallLogComposer = false;

		private boolean mNeedPhotoForVCard = true;

		private static final String[] sContactsProjection = new String[] {
		Contacts._ID,
		};
		@@ -332,17 +334,17 @@ public class VCardComposer {
		private static final String FLAG_TIMEZONE_UTC = "Z";

		public VCardComposer(Context context) {
		this(context, VCardConfig.VCARD_TYPE_DEFAULT, true, false);
		this(context, VCardConfig.VCARD_TYPE_DEFAULT, true, false, true);
		}

		public VCardComposer(Context context, String vcardTypeStr,
		boolean careHandlerErrors) {
		this(context, VCardConfig.getVCardTypeFromString(vcardTypeStr),
		careHandlerErrors, false);
		careHandlerErrors, false, true);
		}

		public VCardComposer(Context context, int vcardType, boolean careHandlerErrors) {
		this(context, vcardType, careHandlerErrors, false);
		this(context, vcardType, careHandlerErrors, false, true);
		}

		/**
		@@ -351,11 +353,12 @@ public class VCardComposer {
		* @param isCallLogComposer true if this composer is for creating Call Log vCard.
		*/
		public VCardComposer(Context context, int vcardType, boolean careHandlerErrors,
		boolean isCallLogComposer) {
		boolean isCallLogComposer, boolean needPhotoInVCard) {
		mContext = context;
		mVCardType = vcardType;
		mCareHandlerErrors = careHandlerErrors;
		mIsCallLogComposer = isCallLogComposer;
		mNeedPhotoForVCard = needPhotoInVCard;
		mContentResolver = context.getContentResolver();

		mIsV30 = VCardConfig.isV30(vcardType);
		@@ -679,7 +682,9 @@ public class VCardComposer {
		appendWebsites(builder, contentValuesListMap);
		appendBirthday(builder, contentValuesListMap);
		appendOrganizations(builder, contentValuesListMap);
		if (mNeedPhotoForVCard) {
		appendPhotos(builder, contentValuesListMap);
		}
		appendNotes(builder, contentValuesListMap);
		// TODO: GroupMembership