diff options
| author | Ricardo Cervera <rcervera@google.com> | 2015-01-16 17:21:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 17:21:32 +0000 |
| commit | e8f6bd484627e16fa2fd9509b0f06056ee44be94 (patch) | |
| tree | d4397eb90b2da9532f3a3810caea2ecb617c5403 | |
| parent | bb600de6e7c5c7a0a1d4b872d2ee100ccc353213 (diff) | |
| parent | 98f07d901492335f51258655fbfa032fa3f2d58e (diff) | |
| download | frameworks_base-e8f6bd484627e16fa2fd9509b0f06056ee44be94.zip frameworks_base-e8f6bd484627e16fa2fd9509b0f06056ee44be94.tar.gz frameworks_base-e8f6bd484627e16fa2fd9509b0f06056ee44be94.tar.bz2 | |
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
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 9a57383..fcecd28 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4326,6 +4326,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 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 228a97d..8ac156a 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3430,6 +3430,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 3c623f6..7c71e99 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -593,7 +593,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> |