Merge "Slices: Fix up some formatting and add examples" into pi-dev (e7c23d8d) · Commits · e / os / android_frameworks_base

core/java/android/app/slice/SliceManager.java

+20 −8

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,17 @@ public class SliceManager {
	* An activity can be statically linked to a slice uri by including a meta-data item		* An activity can be statically linked to a slice uri by including a meta-data item
	* for this key that contains a valid slice uri for the same application declaring		* for this key that contains a valid slice uri for the same application declaring
	* the activity.		* the activity.
			*
			* <pre class="prettyprint">
			* {@literal
			* <activity android:name="com.example.mypkg.MyActivity">
			* <meta-data android:name="android.metadata.SLICE_URI"
			* android:value="content://com.example.mypkg/main_slice" />
			* </activity>}
			* </pre>
			*
			* @see #mapIntentToUri(Intent)
			* @see SliceProvider#onMapIntentToUri(Intent)
	*/		*/
	public static final String SLICE_METADATA_KEY = "android.metadata.SLICE_URI";		public static final String SLICE_METADATA_KEY = "android.metadata.SLICE_URI";

	@@ -257,16 +268,17 @@ public class SliceManager {
	* <p>		* <p>
	* This goes through a several stage resolution process to determine if any slice		* This goes through a several stage resolution process to determine if any slice
	* can represent this intent.		* can represent this intent.
	* - If the intent contains data that {@link ContentResolver#getType} is		* <ol>
	* {@link SliceProvider#SLICE_TYPE} then the data will be returned.		* <li> If the intent contains data that {@link ContentResolver#getType} is
	* - If the intent with {@link #CATEGORY_SLICE} added resolves to a provider, then		* {@link SliceProvider#SLICE_TYPE} then the data will be returned.</li>
			* <li>If the intent with {@link #CATEGORY_SLICE} added resolves to a provider, then
	* the provider will be asked to {@link SliceProvider#onMapIntentToUri} and that result		* the provider will be asked to {@link SliceProvider#onMapIntentToUri} and that result
	* will be returned.		* will be returned.</li>
	* - Lastly, if the intent explicitly points at an activity, and that activity has		* <li>Lastly, if the intent explicitly points at an activity, and that activity has
	* meta-data for key {@link #SLICE_METADATA_KEY}, then the Uri specified there will be		* meta-data for key {@link #SLICE_METADATA_KEY}, then the Uri specified there will be
	* returned.		* returned.</li>
	* - If no slice is found, then {@code null} is returned.		* <li>If no slice is found, then {@code null} is returned.</li>
	*		* </ol>
	* @param intent The intent associated with a slice.		* @param intent The intent associated with a slice.
	* @return The Slice Uri provided by the app or null if none exists.		* @return The Slice Uri provided by the app or null if none exists.
	* @see Slice		* @see Slice