Merge "Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called." into jb-dev

Mike Cleron · Android (Google) Code Review · commit 841a37aa5b66 · 2012-05-02T23:56:08.000-07:00
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
@@ -2742,6 +2742,10 @@ public boolean onNavigateUpFromChild(Activity child) {
      * may choose to override this method to construct the desired task stack in a different
      * way.</p>
      *
+     * <p>This method will be invoked by the default implementation of {@link #onNavigateUp()}
+     * if {@link #shouldUpRecreateTask(Intent)} returns true when supplied with the intent
+     * returned by {@link #getParentActivityIntent()}.</p>
+     *
      * <p>Applications that wish to supply extra Intent parameters to the parent stack defined
      * by the manifest should override {@link #onPrepareNavigateUpTaskStack(TaskStackBuilder)}.</p>
      *

Original file line number	Diff line number	Diff line change
`@@ -2742,6 +2742,10 @@ public boolean onNavigateUpFromChild(Activity child) {`
`2742`	`2742`	`* may choose to override this method to construct the desired task stack in a different`
`2743`	`2743`	`* way.</p>`
`2744`	`2744`	`*`
	`2745`	`+ * <p>This method will be invoked by the default implementation of {@link #onNavigateUp()}`
	`2746`	`+ * if {@link #shouldUpRecreateTask(Intent)} returns true when supplied with the intent`
	`2747`	`+ * returned by {@link #getParentActivityIntent()}.</p>`
	`2748`	`+ *`
`2745`	`2749`	`* <p>Applications that wish to supply extra Intent parameters to the parent stack defined`
`2746`	`2750`	`* by the manifest should override {@link #onPrepareNavigateUpTaskStack(TaskStackBuilder)}.</p>`
`2747`	`2751`	`*`