resolved conflicts for merge of 3571ff40 to master (31708d46) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+56 −56

Original line number	Diff line number	Diff line
		@@ -240,35 +240,35 @@ import java.util.Set;
		*
		* <activity class=".NotesList" android:label="@string/title_notes_list">
		* <intent-filter>
		* <action android:value="android.intent.action.MAIN" />
		* <category android:value="android.intent.category.LAUNCHER" />
		* <action android:name="android.intent.action.MAIN" />
		* <category android:name="android.intent.category.LAUNCHER" />
		* </intent-filter>
		* <intent-filter>
		* <action android:value="android.intent.action.VIEW" />
		* <action android:value="android.intent.action.EDIT" />
		* <action android:value="android.intent.action.PICK" />
		* <category android:value="android.intent.category.DEFAULT" />
		* <type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* <action android:name="android.intent.action.VIEW" />
		* <action android:name="android.intent.action.EDIT" />
		* <action android:name="android.intent.action.PICK" />
		* <category android:name="android.intent.category.DEFAULT" />
		* <data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* </intent-filter>
		* <intent-filter>
		* <action android:value="android.intent.action.GET_CONTENT" />
		* <category android:value="android.intent.category.DEFAULT" />
		* <type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* <action android:name="android.intent.action.GET_CONTENT" />
		* <category android:name="android.intent.category.DEFAULT" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter>
		* </activity>
		*
		* <activity class=".NoteEditor" android:label="@string/title_note">
		* <intent-filter android:label="@string/resolve_edit">
		* <action android:value="android.intent.action.VIEW" />
		* <action android:value="android.intent.action.EDIT" />
		* <category android:value="android.intent.category.DEFAULT" />
		* <type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* <action android:name="android.intent.action.VIEW" />
		* <action android:name="android.intent.action.EDIT" />
		* <category android:name="android.intent.category.DEFAULT" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter>
		*
		* <intent-filter>
		* <action android:value="android.intent.action.INSERT" />
		* <category android:value="android.intent.category.DEFAULT" />
		* <type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* <action android:name="android.intent.action.INSERT" />
		* <category android:name="android.intent.category.DEFAULT" />
		* <data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* </intent-filter>
		*
		* </activity>
		@@ -276,11 +276,11 @@ import java.util.Set;
		* <activity class=".TitleEditor" android:label="@string/title_edit_title"
		* android:theme="@android:style/Theme.Dialog">
		* <intent-filter android:label="@string/resolve_title">
		* <action android:value="<i>com.android.notepad.action.EDIT_TITLE</i>" />
		* <category android:value="android.intent.category.DEFAULT" />
		* <category android:value="android.intent.category.ALTERNATIVE" />
		* <category android:value="android.intent.category.SELECTED_ALTERNATIVE" />
		* <type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* <action android:name="<i>com.android.notepad.action.EDIT_TITLE</i>" />
		* <category android:name="android.intent.category.DEFAULT" />
		* <category android:name="android.intent.category.ALTERNATIVE" />
		* <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter>
		* </activity>
		*
		@@ -294,8 +294,8 @@ import java.util.Set;
		* <ol>
		* <li><pre>
		* <intent-filter>
		* <action android:value="{@link #ACTION_MAIN android.intent.action.MAIN}" />
		* <category android:value="{@link #CATEGORY_LAUNCHER android.intent.category.LAUNCHER}" />
		* <action android:name="{@link #ACTION_MAIN android.intent.action.MAIN}" />
		* <category android:name="{@link #CATEGORY_LAUNCHER android.intent.category.LAUNCHER}" />
		* </intent-filter></pre>
		* <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
		@@ -303,11 +303,11 @@ import java.util.Set;
		* listed in the application launcher.</p>
		* <li><pre>
		* <intent-filter>
		* <action android:value="{@link #ACTION_VIEW android.intent.action.VIEW}" />
		* <action android:value="{@link #ACTION_EDIT android.intent.action.EDIT}" />
		* <action android:value="{@link #ACTION_PICK android.intent.action.PICK}" />
		* <category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* <action android:name="{@link #ACTION_VIEW android.intent.action.VIEW}" />
		* <action android:name="{@link #ACTION_EDIT android.intent.action.EDIT}" />
		* <action android:name="{@link #ACTION_PICK android.intent.action.PICK}" />
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <data mimeType:name="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		* <p>This declares the things that the activity can do on a directory of
		* notes. The type being supported is given with the <type> tag, where
		@@ -322,9 +322,9 @@ import java.util.Set;
		* activity when its component name is not explicitly specified.</p>
		* <li><pre>
		* <intent-filter>
		* <action android:value="{@link #ACTION_GET_CONTENT android.intent.action.GET_CONTENT}" />
		* <category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* <action android:name="{@link #ACTION_GET_CONTENT android.intent.action.GET_CONTENT}" />
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		* <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
		@@ -371,10 +371,10 @@ import java.util.Set;
		* <ol>
		* <li><pre>
		* <intent-filter android:label="@string/resolve_edit">
		* <action android:value="{@link #ACTION_VIEW android.intent.action.VIEW}" />
		* <action android:value="{@link #ACTION_EDIT android.intent.action.EDIT}" />
		* <category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* <action android:name="{@link #ACTION_VIEW android.intent.action.VIEW}" />
		* <action android:name="{@link #ACTION_EDIT android.intent.action.EDIT}" />
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		* <p>The first, primary, purpose of this activity is to let the user interact
		* with a single note, as decribed by the MIME type
		@@ -384,9 +384,9 @@ import java.util.Set;
		* specifying its component.</p>
		* <li><pre>
		* <intent-filter>
		* <action android:value="{@link #ACTION_INSERT android.intent.action.INSERT}" />
		* <category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <type android:value="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* <action android:name="{@link #ACTION_INSERT android.intent.action.INSERT}" />
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		* <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
		@@ -422,11 +422,11 @@ import java.util.Set;
		*
		* <pre>
		* <intent-filter android:label="@string/resolve_title">
		* <action android:value="<i>com.android.notepad.action.EDIT_TITLE</i>" />
		* <category android:value="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <category android:value="{@link #CATEGORY_ALTERNATIVE android.intent.category.ALTERNATIVE}" />
		* <category android:value="{@link #CATEGORY_SELECTED_ALTERNATIVE android.intent.category.SELECTED_ALTERNATIVE}" />
		* <type android:value="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* <action android:name="<i>com.android.notepad.action.EDIT_TITLE</i>" />
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <category android:name="{@link #CATEGORY_ALTERNATIVE android.intent.category.ALTERNATIVE}" />
		* <category android:name="{@link #CATEGORY_SELECTED_ALTERNATIVE android.intent.category.SELECTED_ALTERNATIVE}" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		*
		* <p>In the single intent template here, we