Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d87d410 authored by Kang Li's avatar Kang Li Committed by android-build-merger
Browse files

Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS."... 

Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am: 8b4f17be
am: 9d6cb206

Change-Id: I40b3e211111afb40789c13bed940310a96f45fcf
parents a691442c 9d6cb206

core/java/android/content/Intent.java

+17 −17
Original line number Diff line number Diff line
@@ -4307,34 +4307,34 @@ public class Intent implements Parcelable, Cloneable { 
     * 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

     * rarely used for {@link #ACTION_CHOOSER} in the past 14 days. Therefore, it is recommended to

     * use the following annotations when applicable:</p>

     * use the following annotations when applicable.</p>

     * <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>

     *     <li>"emotion": represents that the topic of the content is mainly about emotions, e.g.,

     *     <li>"emotion" represents that the topic of the content is mainly about emotions, e.g.,

     *     happy, and sad.</li>

     *     <li>"person": represents that the topic of the content is mainly about persons, e.g.,

     *     <li>"person" represents that the topic of the content is mainly about persons, e.g.,

     *     face, finger, standing, and walking.</li>

     *     <li>"child": represents that the topic of the content is mainly about children, e.g.,

     *     <li>"child" represents that the topic of the content is mainly about children, e.g.,

     *     child, and baby.</li>

     *     <li>"selfie": represents that the topic of the content is mainly about selfies.</li>

     *     <li>"crowd": represents that the topic of the content is mainly about crowds.</li>

     *     <li>"party": represents that the topic of the content is mainly about parties.</li>

     *     <li>"animal": represent that the topic of the content is mainly about animals.</li>

     *     <li>"plant": represents that the topic of the content is mainly about plants, e.g.,

     *     <li>"selfie" represents that the topic of the content is mainly about selfies.</li>

     *     <li>"crowd" represents that the topic of the content is mainly about crowds.</li>

     *     <li>"party" represents that the topic of the content is mainly about parties.</li>

     *     <li>"animal" represent that the topic of the content is mainly about animals.</li>

     *     <li>"plant" represents that the topic of the content is mainly about plants, e.g.,

     *     flowers.</li>

     *     <li>"vacation": represents that the topic of the content is mainly about vacations.</li>

     *     <li>"fashion": represents that the topic of the content is mainly about fashion, e.g.

     *     <li>"vacation" represents that the topic of the content is mainly about vacations.</li>

     *     <li>"fashion" represents that the topic of the content is mainly about fashion, e.g.

     *     sunglasses, jewelry, handbags and clothing.</li>

     *     <li>"material": represents that the topic of the content is mainly about materials, e.g.,

     *     <li>"material" represents that the topic of the content is mainly about materials, e.g.,

     *     paper, and silk.</li>

     *     <li>"vehicle": represents that the topic of the content is mainly about vehicles, like

     *     <li>"vehicle" represents that the topic of the content is mainly about vehicles, like

     *     cars, and boats.</li>

     *     <li>"document": represents that the topic of the content is mainly about documents, e.g.

     *     <li>"document" represents that the topic of the content is mainly about documents, e.g.

     *     posters.</li>

     *     <li>"design": represents that the topic of the content is mainly about design, e.g. arts

     *     <li>"design" represents that the topic of the content is mainly about design, e.g. arts

     *     and designs of houses.</li>

     *     <li>"holiday": represents that the topic of the content is mainly about holidays, e.g.,

     *     <li>"holiday" represents that the topic of the content is mainly about holidays, e.g.,

     *     Christmas and Thanksgiving.</li>

     * </ul>

     */