diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-16 14:54:11 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-16 14:54:11 -0700 |
commit | 6a294263f78ce8177de48cb9480bbe39d9e442cd (patch) | |
tree | ddd3299132e60ed533a28adcf4f9642d2fd25243 /core/java/android/content/Intent.java | |
parent | 4a967dabc3c610e93cfc9cc1f8811e72f54d1797 (diff) | |
parent | 8ecb36eec61f119f500a805b82438aadb3396a19 (diff) | |
download | frameworks_base-6a294263f78ce8177de48cb9480bbe39d9e442cd.zip frameworks_base-6a294263f78ce8177de48cb9480bbe39d9e442cd.tar.gz frameworks_base-6a294263f78ce8177de48cb9480bbe39d9e442cd.tar.bz2 |
Merge commit 'goog/readonly-korg-master' into merge_korg_master
* commit 'goog/readonly-korg-master':
Fixed Android issue #400, where the Intent documentation was inaccurate in a number of places, undoubtedly causing untold grief to innumerable masses.
Bug Fixed for libagl.
Diffstat (limited to 'core/java/android/content/Intent.java')
-rw-r--r-- | core/java/android/content/Intent.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 54d2e76..2d23140 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -75,10 +75,10 @@ import java.util.Set; * <p>Some examples of action/data pairs are:</p> * * <ul> - * <li> <p><b>{@link #ACTION_VIEW} <i>content://contacts/1</i></b> -- Display + * <li> <p><b>{@link #ACTION_VIEW} <i>content://contacts/people/1</i></b> -- Display * information about the person whose identifier is "1".</p> * </li> - * <li> <p><b>{@link #ACTION_DIAL} <i>content://contacts/1</i></b> -- Display + * <li> <p><b>{@link #ACTION_DIAL} <i>content://contacts/people/1</i></b> -- Display * the phone dialer with the person filled in.</p> * </li> * <li> <p><b>{@link #ACTION_VIEW} <i>tel:123</i></b> -- Display @@ -89,10 +89,10 @@ import java.util.Set; * <li> <p><b>{@link #ACTION_DIAL} <i>tel:123</i></b> -- Display * the phone dialer with the given number filled in.</p> * </li> - * <li> <p><b>{@link #ACTION_EDIT} <i>content://contacts/1</i></b> -- Edit + * <li> <p><b>{@link #ACTION_EDIT} <i>content://contacts/people/1</i></b> -- Edit * information about the person whose identifier is "1".</p> * </li> - * <li> <p><b>{@link #ACTION_VIEW} <i>content://contacts/</i></b> -- Display + * <li> <p><b>{@link #ACTION_VIEW} <i>content://contacts/people/</i></b> -- Display * a list of people, which the user can browse through. This example is a * typical top-level entry into the Contacts application, showing you the * list of people. Selecting a particular person to view would result in a @@ -156,7 +156,7 @@ import java.util.Set; * defined in the Intent class, but applications can also define their own. * These strings use java style scoping, to ensure they are unique -- for * example, the standard {@link #ACTION_VIEW} is called - * "android.app.action.VIEW".</p> + * "android.intent.action.VIEW".</p> * * <p>Put together, the set of actions, data types, categories, and extra data * defines a language for the system allowing for the expression of phrases @@ -347,7 +347,7 @@ import java.util.Set; * <li> <p><b>{ action=android.app.action.MAIN, * category=android.app.category.LAUNCHER }</b> is the actual intent * used by the Launcher to populate its top-level list.</p> - * <li> <p><b>{ action=android.app.action.VIEW + * <li> <p><b>{ action=android.intent.action.VIEW * data=content://com.google.provider.NotePad/notes }</b> * displays a list of all the notes under * "content://com.google.provider.NotePad/notes", which @@ -399,7 +399,7 @@ import java.util.Set; * NoteEditor activity:</p> * * <ul> - * <li> <p><b>{ action=android.app.action.VIEW + * <li> <p><b>{ action=android.intent.action.VIEW * data=content://com.google.provider.NotePad/notes/<var>{ID}</var> }</b> * shows the user the content of note <var>{ID}</var>.</p> * <li> <p><b>{ action=android.app.action.EDIT |