diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 18:36:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 18:36:45 +0000 |
| commit | 90312d808f4a5181b5cb99c78e64b7e5d1465895 (patch) | |
| tree | 88bd466ecfa59e6338d84bb7df92fb94ee261664 | |
| parent | 8a7f20f5a4d83580470133a9a325a66edbb7363e (diff) | |
| parent | 2287879039556ad3c8fce58974e2396b4a2dab45 (diff) | |
| download | frameworks_base-90312d808f4a5181b5cb99c78e64b7e5d1465895.zip frameworks_base-90312d808f4a5181b5cb99c78e64b7e5d1465895.tar.gz frameworks_base-90312d808f4a5181b5cb99c78e64b7e5d1465895.tar.bz2 | |
am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index fab88a2..38cd126 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4785,6 +4785,10 @@ public class Activity extends ContextThemeWrapper * <p>You will receive this call immediately before onResume() when your * activity is re-starting. * + * <p>This method is never invoked if your activity sets + * {@link android.R.styleable#AndroidManifestActivity_noHistory noHistory} to + * <code>true</code>. + * * @param requestCode The integer request code originally supplied to * startActivityForResult(), allowing you to identify who this * result came from. diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index af7ec5e..2fe727c 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3610,6 +3610,10 @@ public class Intent implements Parcelable, Cloneable { * the user navigates away from it, the activity is finished. This may also * be set with the {@link android.R.styleable#AndroidManifestActivity_noHistory * noHistory} attribute. + * + * <p>If set, {@link android.app.Activity#onActivityResult onActivityResult()} + * is never invoked when the current activity starts a new activity which + * sets a result and finishes. */ public static final int FLAG_ACTIVITY_NO_HISTORY = 0x40000000; /** diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 7374a67..c1256f9 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -686,7 +686,9 @@ visible on screen — "{@code true}" if it should be finished, and <p> A value of "{@code true}" means that the activity will not leave a historical trace. It will not remain in the activity stack for the task, -so the user will not be able to return to it. +so the user will not be able to return to it. In this case, +{@link android.app.Activity#onActivityResult onActivityResult()} is never called if you +start another activity for a result from this activity. </p> <p> |