Merge "API modifications for TaskStackBuilder" into jb-dev (39f412d8) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −4

Original line number	Diff line number	Diff line
		@@ -4001,17 +4001,20 @@ package android.app {
		method public void setDefaultTab(int);
		}

		public class TaskStackBuilder implements java.lang.Iterable {
		public class TaskStackBuilder {
		method public android.app.TaskStackBuilder addNextIntent(android.content.Intent);
		method public android.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent);
		method public android.app.TaskStackBuilder addParentStack(android.app.Activity);
		method public android.app.TaskStackBuilder addParentStack(java.lang.Class<?>);
		method public android.app.TaskStackBuilder addParentStack(android.content.ComponentName);
		method public static android.app.TaskStackBuilder from(android.content.Context);
		method public android.content.Intent getIntent(int);
		method public static android.app.TaskStackBuilder create(android.content.Context);
		method public android.content.Intent editIntentAt(int);
		method public int getIntentCount();
		method public android.content.Intent[] getIntents();
		method public android.app.PendingIntent getPendingIntent(int, int);
		method public java.util.Iterator<android.content.Intent> iterator();
		method public android.app.PendingIntent getPendingIntent(int, int, android.os.Bundle);
		method public void startActivities();
		method public void startActivities(android.os.Bundle);
		}

		public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener {

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2710,7 +2710,7 @@ public class Activity extends ContextThemeWrapper
		Intent upIntent = getParentActivityIntent();
		if (upIntent != null) {
		if (shouldUpRecreateTask(upIntent)) {
		TaskStackBuilder b = TaskStackBuilder.from(this);
		TaskStackBuilder b = TaskStackBuilder.create(this);
		onCreateNavigateUpTaskStack(b);
		onPrepareNavigateUpTaskStack(b);
		b.startActivities();

core/java/android/app/TaskStackBuilder.java

+72 −10

Original line number	Diff line number	Diff line
		@@ -22,10 +22,10 @@ import android.content.Intent;
		import android.content.pm.ActivityInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.os.Bundle;
		import android.util.Log;

		import java.util.ArrayList;
		import java.util.Iterator;

		/**
		* Utility class for constructing synthetic back stacks for cross-task navigation
		@@ -56,7 +56,7 @@ import java.util.Iterator;
		* from the design guide.
		* </div>
		*/
		public class TaskStackBuilder implements Iterable<Intent> {
		public class TaskStackBuilder {
		private static final String TAG = "TaskStackBuilder";

		private final ArrayList<Intent> mIntents = new ArrayList<Intent>();
		@@ -73,7 +73,7 @@ public class TaskStackBuilder implements Iterable<Intent> {
		* @param context The context that will launch the new task stack or generate a PendingIntent
		* @return A new TaskStackBuilder
		*/
		public static TaskStackBuilder from(Context context) {
		public static TaskStackBuilder create(Context context) {
		return new TaskStackBuilder(context);
		}

		@@ -89,6 +89,30 @@ public class TaskStackBuilder implements Iterable<Intent> {
		return this;
		}

		/**
		* Add a new Intent with the resolved chain of parents for the target activity to
		* the task stack.
		*
		* <p>This is equivalent to calling {@link #addParentStack(ComponentName) addParentStack}
		* with the resolved ComponentName of nextIntent (if it can be resolved), followed by
		* {@link #addNextIntent(Intent) addNextIntent} with nextIntent.</p>
		*
		* @param nextIntent Intent for the topmost Activity in the synthesized task stack.
		* Its chain of parents as specified in the manifest will be added.
		* @return This TaskStackBuilder for method chaining.
		*/
		public TaskStackBuilder addNextIntentWithParentStack(Intent nextIntent) {
		ComponentName target = nextIntent.getComponent();
		if (target == null) {
		target = nextIntent.resolveActivity(mSourceContext.getPackageManager());
		}
		if (target != null) {
		addParentStack(target);
		}
		addNextIntent(nextIntent);
		return this;
		}

		/**
		* Add the activity parent chain as specified by the
		* {@link Activity#getParentActivityIntent() getParentActivityIntent()} method of the activity
		@@ -200,25 +224,32 @@ public class TaskStackBuilder implements Iterable<Intent> {
		}

		/**
		* Get the intent at the specified index.
		* Return the intent at the specified index for modification.
		* Useful if you need to modify the flags or extras of an intent that was previously added,
		* for example with {@link #addParentStack(Activity)}.
		*
		* @param index Index from 0-getIntentCount()
		* @return the intent at position index
		*/
		public Intent getIntent(int index) {
		public Intent editIntentAt(int index) {
		return mIntents.get(index);
		}

		public Iterator<Intent> iterator() {
		return mIntents.iterator();
		/**
		* Start the task stack constructed by this builder.
		*/
		public void startActivities() {
		startActivities(null);
		}

		/**
		* Start the task stack constructed by this builder.
		*
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* Context.startActivity(Intent, Bundle)} for more details.
		*/
		public void startActivities() {
		public void startActivities(Bundle options) {
		if (mIntents.isEmpty()) {
		throw new IllegalStateException(
		"No intents added to TaskStackBuilder; cannot startActivities");
		@@ -228,7 +259,7 @@ public class TaskStackBuilder implements Iterable<Intent> {
		intents[0].addFlags(Intent.FLAG_ACTIVITY_NEW_TASK \|
		Intent.FLAG_ACTIVITY_CLEAR_TASK \|
		Intent.FLAG_ACTIVITY_TASK_ON_HOME);
		mSourceContext.startActivities(intents);
		mSourceContext.startActivities(intents, options);
		}

		/**
		@@ -240,9 +271,29 @@ public class TaskStackBuilder implements Iterable<Intent> {
		* {@link PendingIntent#FLAG_UPDATE_CURRENT}, or any of the flags supported by
		* {@link Intent#fillIn(Intent, int)} to control which unspecified parts of the
		* intent that can be supplied when the actual send happens.
		*
		* @return The obtained PendingIntent
		*/
		public PendingIntent getPendingIntent(int requestCode, int flags) {
		return getPendingIntent(requestCode, flags, null);
		}

		/**
		* Obtain a {@link PendingIntent} for launching the task constructed by this builder so far.
		*
		* @param requestCode Private request code for the sender
		* @param flags May be {@link PendingIntent#FLAG_ONE_SHOT},
		* {@link PendingIntent#FLAG_NO_CREATE}, {@link PendingIntent#FLAG_CANCEL_CURRENT},
		* {@link PendingIntent#FLAG_UPDATE_CURRENT}, or any of the flags supported by
		* {@link Intent#fillIn(Intent, int)} to control which unspecified parts of the
		* intent that can be supplied when the actual send happens.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @return The obtained PendingIntent
		*/
		public PendingIntent getPendingIntent(int requestCode, int flags, Bundle options) {
		if (mIntents.isEmpty()) {
		throw new IllegalStateException(
		"No intents added to TaskStackBuilder; cannot getPendingIntent");
		@@ -252,6 +303,17 @@ public class TaskStackBuilder implements Iterable<Intent> {
		intents[0].addFlags(Intent.FLAG_ACTIVITY_NEW_TASK \|
		Intent.FLAG_ACTIVITY_CLEAR_TASK \|
		Intent.FLAG_ACTIVITY_TASK_ON_HOME);
		return PendingIntent.getActivities(mSourceContext, requestCode, intents, flags);
		return PendingIntent.getActivities(mSourceContext, requestCode, intents, flags, options);
		}

		/**
		* Return an array containing the intents added to this builder. The intent at the
		* root of the task stack will appear as the first item in the array and the
		* intent at the top of the stack will appear as the last item.
		*
		* @return An array containing the intents added to this builder.
		*/
		public Intent[] getIntents() {
		return mIntents.toArray(new Intent[mIntents.size()]);
		}
		}