Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from... (6b36aeb4) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4311,9 +4311,10 @@ public class Intent implements Parcelable, Cloneable {
	* <p>Annotations should describe the major components or topics of the content. It is up to		* <p>Annotations should describe the major components or topics of the content. It is up to
	* apps initiating {@link #ACTION_CHOOSER} to learn and add annotations. Annotations should be		* apps initiating {@link #ACTION_CHOOSER} to learn and add annotations. Annotations should be
	* learned in advance, e.g., when creating or saving content, to avoid increasing latency to		* learned in advance, e.g., when creating or saving content, to avoid increasing latency to
	* start {@link #ACTION_CHOOSER}. Performance on customized annotations can suffer, if they are		* start {@link #ACTION_CHOOSER}. Names of customized annotations should not contain the colon
	* rarely used for {@link #ACTION_CHOOSER} in the past 14 days. Therefore, it is recommended to		* character. Performance on customized annotations can suffer, if they are rarely used for
	* use the following annotations when applicable.</p>		* {@link #ACTION_CHOOSER} in the past 14 days. Therefore, it is recommended to use the
			* following annotations when applicable.</p>
	* <ul>		* <ul>
	* <li>"product" represents that the topic of the content is mainly about products, e.g.,		* <li>"product" represents that the topic of the content is mainly about products, e.g.,
	* health & beauty, and office supplies.</li>		* health & beauty, and office supplies.</li>