Merge branch 'gingerbread' into gingerbread-release (ea17de78) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2609,6 +2609,10 @@ public class Activity extends ContextThemeWrapper
	* <p>This can be useful if you know that you will never show a dialog again and		* <p>This can be useful if you know that you will never show a dialog again and
	* want to avoid the overhead of saving and restoring it in the future.		* want to avoid the overhead of saving and restoring it in the future.
	*		*
			* <p>As of {@link android.os.Build.VERSION_CODES#GINGERBREAD}, this function
			* will not throw an exception if you try to remove an ID that does not
			* currently have an associated dialog.</p>
			*
	* @param id The id of the managed dialog.		* @param id The id of the managed dialog.
	*		*
	* @see #onCreateDialog(int, Bundle)		* @see #onCreateDialog(int, Bundle)
	@@ -2617,18 +2621,14 @@ public class Activity extends ContextThemeWrapper
	* @see #dismissDialog(int)		* @see #dismissDialog(int)
	*/		*/
	public final void removeDialog(int id) {		public final void removeDialog(int id) {
	if (mManagedDialogs == null) {		if (mManagedDialogs != null) {
	return;
	}

	final ManagedDialog md = mManagedDialogs.get(id);		final ManagedDialog md = mManagedDialogs.get(id);
	if (md == null) {		if (md != null) {
	return;
	}

	md.mDialog.dismiss();		md.mDialog.dismiss();
	mManagedDialogs.remove(id);		mManagedDialogs.remove(id);
	}		}
			}
			}

	/**		/**
	* This hook is called when the user signals the desire to start a search.		* This hook is called when the user signals the desire to start a search.

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@ public class SyncStorageEngine extends Handler {

	public static final long NOT_IN_BACKOFF_MODE = -1;		public static final long NOT_IN_BACKOFF_MODE = -1;

	private static final Intent SYNC_CONNECTION_SETTING_CHANGED_INTENT =		public static final Intent SYNC_CONNECTION_SETTING_CHANGED_INTENT =
	new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED");		new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED");

	// TODO: i18n -- grab these out of resources.		// TODO: i18n -- grab these out of resources.

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,8 +28,21 @@ public final class InputQueue {

	private static final boolean DEBUG = false;		private static final boolean DEBUG = false;

			/**
			* Interface to receive notification of when an InputQueue is associated
			* and dissociated with a thread.
			*/
	public static interface Callback {		public static interface Callback {
			/**
			* Called when the given InputQueue is now associated with the
			* thread making this call, so it can start receiving events from it.
			*/
	void onInputQueueCreated(InputQueue queue);		void onInputQueueCreated(InputQueue queue);

			/**
			* Called when the given InputQueue is no longer associated with
			* the thread and thus not dispatching events.
			*/
	void onInputQueueDestroyed(InputQueue queue);		void onInputQueueDestroyed(InputQueue queue);
	}		}

−163 B (1.66 KiB)

Loading image diff...

−407 B (1.61 KiB)

Loading image diff...