Merge branch 'froyo' into froyo-release (1075b3e5) · Commits · e / os / android_frameworks_base

api/current.xml

+45 −1

Original line number	Diff line number	Diff line
		@@ -27144,7 +27144,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fd" type="android.os.ParcelFileDescriptor">
		<parameter name="newState" type="android.os.ParcelFileDescriptor">
		</parameter>
		</method>
		</interface>
		@@ -37923,6 +37923,28 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_EXTERNAL_APPLICATIONS_AVAILABLE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_FACTORY_TEST"
		type="java.lang.String"
		transient="false"
		@@ -38890,6 +38912,28 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_CHANGED_PACKAGE_LIST"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.extra.changed_package_list""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_CHANGED_UID_LIST"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.extra.changed_uid_list""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_DATA_REMOVED"
		type="java.lang.String"
		transient="false"

core/java/android/content/Intent.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -1395,7 +1395,6 @@ public class Intent implements Parcelable, Cloneable {
		*
		* <p class="note">This is a protected intent that can only be sent
		* by the system.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE =
		@@ -1420,7 +1419,6 @@ public class Intent implements Parcelable, Cloneable {
		*
		* <p class="note">This is a protected intent that can only be sent
		* by the system.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE =
		@@ -2243,7 +2241,6 @@ public class Intent implements Parcelable, Cloneable {
		* {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_AVAILABLE},
		* {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE}
		* and contains a string array of all of the components that have changed.
		* @hide
		*/
		public static final String EXTRA_CHANGED_PACKAGE_LIST =
		"android.intent.extra.changed_package_list";
		@@ -2254,7 +2251,6 @@ public class Intent implements Parcelable, Cloneable {
		* {@link android.content.Intent#ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE}
		* and contains an integer array of uids of all of the components
		* that have changed.
		* @hide
		*/
		public static final String EXTRA_CHANGED_UID_LIST =
		"android.intent.extra.changed_uid_list";

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -534,9 +534,11 @@ public class VCardComposer {
		.appendEmails(contentValuesListMap.get(Email.CONTENT_ITEM_TYPE))
		.appendPostals(contentValuesListMap.get(StructuredPostal.CONTENT_ITEM_TYPE))
		.appendOrganizations(contentValuesListMap.get(Organization.CONTENT_ITEM_TYPE))
		.appendWebsites(contentValuesListMap.get(Website.CONTENT_ITEM_TYPE))
		.appendPhotos(contentValuesListMap.get(Photo.CONTENT_ITEM_TYPE))
		.appendNotes(contentValuesListMap.get(Note.CONTENT_ITEM_TYPE))
		.appendWebsites(contentValuesListMap.get(Website.CONTENT_ITEM_TYPE));
		if ((mVCardType & VCardConfig.FLAG_REFRAIN_IMAGE_EXPORT) == 0) {
		builder.appendPhotos(contentValuesListMap.get(Photo.CONTENT_ITEM_TYPE));
		}
		builder.appendNotes(contentValuesListMap.get(Note.CONTENT_ITEM_TYPE))
		.appendEvents(contentValuesListMap.get(Event.CONTENT_ITEM_TYPE))
		.appendIms(contentValuesListMap.get(Im.CONTENT_ITEM_TYPE))
		.appendRelation(contentValuesListMap.get(Relation.CONTENT_ITEM_TYPE));

core/java/android/pim/vcard/VCardConfig.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,14 @@ public class VCardConfig {
		*/
		public static final int FLAG_APPEND_TYPE_PARAM = 0x04000000;

		/**
		* <P>
		* The flag asking exporter to refrain image export.
		* </P>
		* @hide will be deleted in the near future.
		*/
		public static final int FLAG_REFRAIN_IMAGE_EXPORT = 0x02000000;

		//// The followings are VCard types available from importer/exporter. ////

		/**

core/java/android/view/View.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -1513,6 +1513,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		*/
		static final int CANCEL_NEXT_UP_EVENT = 0x04000000;

		/**
		* Indicates that we should awaken scroll bars once attached
		*
		* @hide
		*/
		private static final int AWAKEN_SCROLL_BARS_ON_ATTACH = 0x08000000;

		/**
		* The parent this view is attached to.
		* {@hide}
		@@ -3838,6 +3845,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		* {@link #INVISIBLE} or {@link #GONE}.
		*/
		protected void onVisibilityChanged(View changedView, int visibility) {
		if (visibility == VISIBLE) {
		if (mAttachInfo != null) {
		initialAwakenScrollBars();
		} else {
		mPrivateFlags \|= AWAKEN_SCROLL_BARS_ON_ATTACH;
		}
		}
		}

		/**
		@@ -3888,6 +3902,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		* @param visibility The new visibility of the window.
		*/
		protected void onWindowVisibilityChanged(int visibility) {
		if (visibility == VISIBLE) {
		initialAwakenScrollBars();
		}
		}

		/**
		@@ -4908,6 +4925,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		awakenScrollBars(mScrollCache.scrollBarDefaultDelayBeforeFade, true);
		}

		/**
		* Trigger the scrollbars to draw.
		* This method differs from awakenScrollBars() only in its default duration.
		* initialAwakenScrollBars() will show the scroll bars for longer than
		* usual to give the user more of a chance to notice them.
		*
		* @return true if the animation is played, false otherwise.
		*/
		private boolean initialAwakenScrollBars() {
		return mScrollCache != null &&
		awakenScrollBars(mScrollCache.scrollBarDefaultDelayBeforeFade * 4, true);
		}

		/**
		* <p>
		* Trigger the scrollbars to draw. When invoked this method starts an
		@@ -5900,6 +5930,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		if ((mPrivateFlags & REQUEST_TRANSPARENT_REGIONS) != 0) {
		mParent.requestTransparentRegion(this);
		}
		if ((mPrivateFlags & AWAKEN_SCROLL_BARS_ON_ATTACH) != 0) {
		initialAwakenScrollBars();
		mPrivateFlags &= ~AWAKEN_SCROLL_BARS_ON_ATTACH;
		}
		}

		/**