Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '841a37aa5b6684ea8738f97b7e99a152bc6d5c7a':
  Clarify documentation about when Activity#onCreateNavigateUpTaskStack will be called.
This commit is contained in:
Mike Cleron
2012-05-02 23:58:35 -07:00
committed by Android Git Automerger
parent f154df1a31 841a37aa5b
commit 546c0a4ae1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/Activity.java
View File

@@ -2742,6 +2742,10 @@ public class Activity extends ContextThemeWrapper
* 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>
*