Merge "Add TaskStackBuilder#addParentStack(ComponentName)" (32ef750a) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3999,6 +3999,7 @@ package android.app {
		method public android.app.TaskStackBuilder addNextIntent(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 int getIntentCount();

core/java/android/app/TaskStackBuilder.java

+39 −2

Original line number	Diff line number	Diff line
		@@ -91,8 +91,10 @@ public class TaskStackBuilder implements Iterable<Intent> {

		/**
		* Add the activity parent chain as specified by the
		* {@link android.R.attr#parentActivityName parentActivityName} attribute of the activity
		* (or activity-alias) element in the application's manifest to the task stack builder.
		* {@link Activity#getParentActivityIntent() getParentActivityIntent()} method of the activity
		* specified and the {@link android.R.attr#parentActivityName parentActivityName} attributes
		* of each successive activity (or activity-alias) element in the application's manifest
		* to the task stack builder.
		*
		* @param sourceActivity All parents of this activity will be added
		* @return This TaskStackBuilder for method chaining
		@@ -155,6 +157,41 @@ public class TaskStackBuilder implements Iterable<Intent> {
		return this;
		}

		/**
		* Add the activity parent chain as specified by the
		* {@link android.R.attr#parentActivityName parentActivityName} attribute of the activity
		* (or activity-alias) element in the application's manifest to the task stack builder.
		*
		* @param sourceActivityName Must specify an Activity component. All parents of
		* this activity will be added
		* @return This TaskStackBuilder for method chaining
		*/
		public TaskStackBuilder addParentStack(ComponentName sourceActivityName) {
		final int insertAt = mIntents.size();
		PackageManager pm = mSourceContext.getPackageManager();
		try {
		ActivityInfo info = pm.getActivityInfo(sourceActivityName, 0);
		String parentActivity = info.parentActivityName;
		Intent parent = new Intent().setComponent(
		new ComponentName(info.packageName, parentActivity));
		while (parent != null) {
		mIntents.add(insertAt, parent);
		info = pm.getActivityInfo(parent.getComponent(), 0);
		parentActivity = info.parentActivityName;
		if (parentActivity != null) {
		parent = new Intent().setComponent(
		new ComponentName(info.packageName, parentActivity));
		} else {
		parent = null;
		}
		}
		} catch (NameNotFoundException e) {
		Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");
		throw new IllegalArgumentException(e);
		}
		return this;
		}

		/**
		* @return the number of intents added so far.
		*/