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

Merge change 4486 into donut

Browse Source 
* changes:
  Fixes #1107690. Updates javadoc for Intent.java, android:value -> android:name.
This commit is contained in:
Android (Google) Code Review
2009-06-17 11:05:56 -07:00
parent ef29f6afb4 4969af7d9f
commit 3571ff40d3
1 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,35 +240,35 @@ import java.util.Set;
* *
* <activity class=".NotesList" android:label="@string/title_notes_list"> * <activity class=".NotesList" android:label="@string/title_notes_list">
* <intent-filter> * <intent-filter>
* <action android:value="android.intent.action.MAIN" /> * <action android:name="android.intent.action.MAIN" />
* <category android:value="android.intent.category.LAUNCHER" /> * <category android:name="android.intent.category.LAUNCHER" />
* </intent-filter> * </intent-filter>
* <intent-filter> * <intent-filter>
* <action android:value="android.intent.action.VIEW" /> * <action android:name="android.intent.action.VIEW" />
* <action android:value="android.intent.action.EDIT" /> * <action android:name="android.intent.action.EDIT" />
* <action android:value="android.intent.action.PICK" /> * <action android:name="android.intent.action.PICK" />
* <category android:value="android.intent.category.DEFAULT" /> * <category android:name="android.intent.category.DEFAULT" />
* &lt;type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt; * &lt;/intent-filter&gt;
* &lt;intent-filter&gt; * &lt;intent-filter&gt;
* &lt;action android:value="android.intent.action.GET_CONTENT" /&gt; * &lt;action android:name="android.intent.action.GET_CONTENT" /&gt;
* &lt;category android:value="android.intent.category.DEFAULT" /&gt; * &lt;category android:name="android.intent.category.DEFAULT" /&gt;
* &lt;type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt; * &lt;/intent-filter&gt;
* &lt;/activity&gt; * &lt;/activity&gt;
* *
* &lt;activity class=".NoteEditor" android:label="@string/title_note"&gt; * &lt;activity class=".NoteEditor" android:label="@string/title_note"&gt;
* &lt;intent-filter android:label="@string/resolve_edit"&gt; * &lt;intent-filter android:label="@string/resolve_edit"&gt;
* &lt;action android:value="android.intent.action.VIEW" /&gt; * &lt;action android:name="android.intent.action.VIEW" /&gt;
* &lt;action android:value="android.intent.action.EDIT" /&gt; * &lt;action android:name="android.intent.action.EDIT" /&gt;
* &lt;category android:value="android.intent.category.DEFAULT" /&gt; * &lt;category android:name="android.intent.category.DEFAULT" /&gt;
* &lt;type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt; * &lt;/intent-filter&gt;
* *
* &lt;intent-filter&gt; * &lt;intent-filter&gt;
* &lt;action android:value="android.intent.action.INSERT" /&gt; * &lt;action android:name="android.intent.action.INSERT" /&gt;
* &lt;category android:value="android.intent.category.DEFAULT" /&gt; * &lt;category android:name="android.intent.category.DEFAULT" /&gt;
* &lt;type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt; * &lt;/intent-filter&gt;
* *
* &lt;/activity&gt; * &lt;/activity&gt;
@@ -276,11 +276,11 @@ import java.util.Set;
* &lt;activity class=".TitleEditor" android:label="@string/title_edit_title" * &lt;activity class=".TitleEditor" android:label="@string/title_edit_title"
* android:theme="@android:style/Theme.Dialog"&gt; * android:theme="@android:style/Theme.Dialog"&gt;
* &lt;intent-filter android:label="@string/resolve_title"&gt; * &lt;intent-filter android:label="@string/resolve_title"&gt;
* &lt;action android:value="<i>com.android.notepad.action.EDIT_TITLE</i>" /&gt; * &lt;action android:name="<i>com.android.notepad.action.EDIT_TITLE</i>" /&gt;
* &lt;category android:value="android.intent.category.DEFAULT" /&gt; * &lt;category android:name="android.intent.category.DEFAULT" /&gt;
* &lt;category android:value="android.intent.category.ALTERNATIVE" /&gt; * &lt;category android:name="android.intent.category.ALTERNATIVE" /&gt;
* &lt;category android:value="android.intent.category.SELECTED_ALTERNATIVE" /&gt; * &lt;category android:name="android.intent.category.SELECTED_ALTERNATIVE" /&gt;
* &lt;type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt; * &lt;/intent-filter&gt;
* &lt;/activity&gt; * &lt;/activity&gt;
* *
@@ -294,8 +294,8 @@ import java.util.Set;
* <ol> * <ol>
* <li><pre> * <li><pre>
* &lt;intent-filter&gt; * &lt;intent-filter&gt;
* &lt;action android:value="{@link #ACTION_MAIN android.intent.action.MAIN}" /&gt; * &lt;action android:name="{@link #ACTION_MAIN android.intent.action.MAIN}" /&gt;
* &lt;category android:value="{@link #CATEGORY_LAUNCHER android.intent.category.LAUNCHER}" /&gt; * &lt;category android:name="{@link #CATEGORY_LAUNCHER android.intent.category.LAUNCHER}" /&gt;
* &lt;/intent-filter&gt;</pre> * &lt;/intent-filter&gt;</pre>
* <p>This provides a top-level entry into the NotePad application: the standard * <p>This provides a top-level entry into the NotePad application: the standard
* MAIN action is a main entry point (not requiring any other information in * MAIN action is a main entry point (not requiring any other information in
@@ -303,11 +303,11 @@ import java.util.Set;
* listed in the application launcher.</p> * listed in the application launcher.</p>
* <li><pre> * <li><pre>
* &lt;intent-filter&gt; * &lt;intent-filter&gt;
* &lt;action android:value="{@link #ACTION_VIEW android.intent.action.VIEW}" /&gt; * &lt;action android:name="{@link #ACTION_VIEW android.intent.action.VIEW}" /&gt;
* &lt;action android:value="{@link #ACTION_EDIT android.intent.action.EDIT}" /&gt; * &lt;action android:name="{@link #ACTION_EDIT android.intent.action.EDIT}" /&gt;
* &lt;action android:value="{@link #ACTION_PICK android.intent.action.PICK}" /&gt; * &lt;action android:name="{@link #ACTION_PICK android.intent.action.PICK}" /&gt;
* &lt;category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt; * &lt;category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt;
* &lt;type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt; * &lt;data mimeType:name="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt;</pre> * &lt;/intent-filter&gt;</pre>
* <p>This declares the things that the activity can do on a directory of * <p>This declares the things that the activity can do on a directory of
* notes. The type being supported is given with the &lt;type&gt; tag, where * notes. The type being supported is given with the &lt;type&gt; tag, where
@@ -322,9 +322,9 @@ import java.util.Set;
* activity when its component name is not explicitly specified.</p> * activity when its component name is not explicitly specified.</p>
* <li><pre> * <li><pre>
* &lt;intent-filter&gt; * &lt;intent-filter&gt;
* &lt;action android:value="{@link #ACTION_GET_CONTENT android.intent.action.GET_CONTENT}" /&gt; * &lt;action android:name="{@link #ACTION_GET_CONTENT android.intent.action.GET_CONTENT}" /&gt;
* &lt;category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt; * &lt;category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt;
* &lt;type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt;</pre> * &lt;/intent-filter&gt;</pre>
* <p>This filter describes the ability return to the caller a note selected by * <p>This filter describes the ability return to the caller a note selected by
* the user without needing to know where it came from. The data type * the user without needing to know where it came from. The data type
@@ -371,10 +371,10 @@ import java.util.Set;
* <ol> * <ol>
* <li><pre> * <li><pre>
* &lt;intent-filter android:label="@string/resolve_edit"&gt; * &lt;intent-filter android:label="@string/resolve_edit"&gt;
* &lt;action android:value="{@link #ACTION_VIEW android.intent.action.VIEW}" /&gt; * &lt;action android:name="{@link #ACTION_VIEW android.intent.action.VIEW}" /&gt;
* &lt;action android:value="{@link #ACTION_EDIT android.intent.action.EDIT}" /&gt; * &lt;action android:name="{@link #ACTION_EDIT android.intent.action.EDIT}" /&gt;
* &lt;category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt; * &lt;category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt;
* &lt;type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt;</pre> * &lt;/intent-filter&gt;</pre>
* <p>The first, primary, purpose of this activity is to let the user interact * <p>The first, primary, purpose of this activity is to let the user interact
* with a single note, as decribed by the MIME type * with a single note, as decribed by the MIME type
@@ -384,9 +384,9 @@ import java.util.Set;
* specifying its component.</p> * specifying its component.</p>
* <li><pre> * <li><pre>
* &lt;intent-filter&gt; * &lt;intent-filter&gt;
* &lt;action android:value="{@link #ACTION_INSERT android.intent.action.INSERT}" /&gt; * &lt;action android:name="{@link #ACTION_INSERT android.intent.action.INSERT}" /&gt;
* &lt;category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt; * &lt;category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt;
* &lt;type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt;</pre> * &lt;/intent-filter&gt;</pre>
* <p>The secondary use of this activity is to insert a new note entry into * <p>The secondary use of this activity is to insert a new note entry into
* an existing directory of notes. This is used when the user creates a new * an existing directory of notes. This is used when the user creates a new
@@ -422,11 +422,11 @@ import java.util.Set;
* *
* <pre> * <pre>
* &lt;intent-filter android:label="@string/resolve_title"&gt; * &lt;intent-filter android:label="@string/resolve_title"&gt;
* &lt;action android:value="<i>com.android.notepad.action.EDIT_TITLE</i>" /&gt; * &lt;action android:name="<i>com.android.notepad.action.EDIT_TITLE</i>" /&gt;
* &lt;category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt; * &lt;category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /&gt;
* &lt;category android:value="{@link #CATEGORY_ALTERNATIVE android.intent.category.ALTERNATIVE}" /&gt; * &lt;category android:name="{@link #CATEGORY_ALTERNATIVE android.intent.category.ALTERNATIVE}" /&gt;
* &lt;category android:value="{@link #CATEGORY_SELECTED_ALTERNATIVE android.intent.category.SELECTED_ALTERNATIVE}" /&gt; * &lt;category android:name="{@link #CATEGORY_SELECTED_ALTERNATIVE android.intent.category.SELECTED_ALTERNATIVE}" /&gt;
* &lt;type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt; * &lt;data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /&gt;
* &lt;/intent-filter&gt;</pre> * &lt;/intent-filter&gt;</pre>
* *
* <p>In the single intent template here, we * <p>In the single intent template here, we