Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.

Browse Source 
Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp

* commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad':
  Updating list of standard Intents in android.content.Intent
This commit is contained in:
Trevor Johns
2009-12-09 15:43:13 -08:00
committed by Android Git Automerger
parent 90073aadd5 7e42e8f334
commit 15650af4ab
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/content/Intent.java
View File

@@ -540,10 +540,33 @@ import java.util.Set;
* {@link #putExtra}.
*
* <ul>
* <li> {@link #EXTRA_TEMPLATE}
* <li> {@link #EXTRA_ALARM_COUNT}
* <li> {@link #EXTRA_BCC}
* <li> {@link #EXTRA_CC}
* <li> {@link #EXTRA_CHANGED_COMPONENT_NAME}
* <li> {@link #EXTRA_DATA_REMOVED}
* <li> {@link #EXTRA_DOCK_STATE}
* <li> {@link #EXTRA_DOCK_STATE_CAR}
* <li> {@link #EXTRA_DOCK_STATE_DESK}
* <li> {@link #EXTRA_DOCK_STATE_UNDOCKED}
* <li> {@link #EXTRA_DONT_KILL_APP}
* <li> {@link #EXTRA_EMAIL}
* <li> {@link #EXTRA_INITIAL_INTENTS}
* <li> {@link #EXTRA_INTENT}
* <li> {@link #EXTRA_KEY_EVENT}
* <li> {@link #EXTRA_PHONE_NUMBER}
* <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}
* <li> {@link #EXTRA_REPLACING}
* <li> {@link #EXTRA_SHORTCUT_ICON}
* <li> {@link #EXTRA_SHORTCUT_ICON_RESOURCE}
* <li> {@link #EXTRA_SHORTCUT_INTENT}
* <li> {@link #EXTRA_STREAM}
* <li> {@link #EXTRA_SHORTCUT_NAME}
* <li> {@link #EXTRA_SUBJECT}
* <li> {@link #EXTRA_TEMPLATE}
* <li> {@link #EXTRA_TEXT}
* <li> {@link #EXTRA_TITLE}
* <li> {@link #EXTRA_UID}
* </ul>
*
* <h3>Flags</h3>