diff options
| author | 2015-01-16 20:06:53 +0000 | |
|---|---|---|
| committer | 2015-01-16 20:06:53 +0000 | |
| commit | 23a6d889aa0cdcb244ccbe2b999a87e7ece7b7e5 (patch) | |
| tree | 5db60d3ced0542b92be52f5cfe60bdb21288de7a | |
| parent | c952235d9f0539a1d76e82944b51e2f8a4fa6ef3 (diff) | |
| parent | 1e59b338e6d1a270947908e53cefd088e2e38fb3 (diff) | |
am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
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 bf0104c1f457..938a820881da 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 af7ec5eecbd0..2fe727cfaf72 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 7374a67e5e16..c1256f986619 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> |