drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs

Browse Source 
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
This commit is contained in:
Scott Main
2013-03-05 13:03:25 -08:00
committed by Android Git Automerger
parent 096c7f7b64 8c82d25072
commit 0f1259ccb7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Fragment.java
View File

@ -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. * containing Activity.
* *
* @param intent The intent to start. * @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. * containing Activity.
* *
* @param intent The intent to start. * @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. * containing Activity.
*/ */
public void startActivityForResult(Intent intent, int requestCode) { 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. * containing Activity.
*/ */
public void startActivityForResult(Intent intent, int requestCode, Bundle options) { public void startActivityForResult(Intent intent, int requestCode, Bundle options) {