summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2013-02-28 01:03:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-02-28 01:03:38 +0000
commit8c82d250723a2ae8f384c6602424a38a1ca101eb (patch)
treea7f36548b4d1d3e816f60d733b8e7047fdae4fa8
parentf353c9ed7d0eb59c0663639f2800c5c4e542386c (diff)
parent87bff974d01a51412846765ce327b5589f55b080 (diff)
Merge "docs: clarify startActivity" into jb-mr1.1-docs
-rw-r--r--core/java/android/app/Fragment.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index c5a382d47dfd..b6aeb84bdb54 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1019,7 +1019,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
- * Call {@link Activity#startActivity(Intent)} on the fragment's
+ * Call {@link Activity#startActivity(Intent)} from the fragment's
* containing Activity.
*
* @param intent The intent to start.
@@ -1029,7 +1029,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
- * Call {@link Activity#startActivity(Intent, Bundle)} on the fragment's
+ * Call {@link Activity#startActivity(Intent, Bundle)} from the fragment's
* containing Activity.
*
* @param intent The intent to start.
@@ -1051,7 +1051,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
- * Call {@link Activity#startActivityForResult(Intent, int)} on the fragment's
+ * Call {@link Activity#startActivityForResult(Intent, int)} from the fragment's
* containing Activity.
*/
public void startActivityForResult(Intent intent, int requestCode) {
@@ -1059,7 +1059,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
- * Call {@link Activity#startActivityForResult(Intent, int, Bundle)} on the fragment's
+ * Call {@link Activity#startActivityForResult(Intent, int, Bundle)} from the fragment's
* containing Activity.
*/
public void startActivityForResult(Intent intent, int requestCode, Bundle options) {