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

Commit 930f9a54 authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix keywords hint and add some hints and a subtype to Slice 

Test: make
Bug: 76461875
Bug: 74338434
Change-Id: If1357f7709cfa9c43fe6882f4b2979d9ab84067d
parent 55b486eb

api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -7200,8 +7200,9 @@ package android.app.slice { 
    field public static final java.lang.String HINT_ACTIONS = "actions";

    field public static final java.lang.String HINT_ERROR = "error";

    field public static final java.lang.String HINT_HORIZONTAL = "horizontal";

    field public static final java.lang.String HINT_KEY_WORDS = "key_words";

    field public static final java.lang.String HINT_KEYWORDS = "keywords";

    field public static final java.lang.String HINT_LARGE = "large";

    field public static final java.lang.String HINT_LAST_UPDATED = "last_updated";

    field public static final java.lang.String HINT_LIST = "list";

    field public static final java.lang.String HINT_LIST_ITEM = "list_item";

    field public static final java.lang.String HINT_NO_TINT = "no_tint";
@@ -7211,10 +7212,12 @@ package android.app.slice { 
    field public static final java.lang.String HINT_SHORTCUT = "shortcut";

    field public static final java.lang.String HINT_SUMMARY = "summary";

    field public static final java.lang.String HINT_TITLE = "title";

    field public static final java.lang.String HINT_TTL = "ttl";

    field public static final java.lang.String SUBTYPE_COLOR = "color";

    field public static final java.lang.String SUBTYPE_CONTENT_DESCRIPTION = "content_description";

    field public static final java.lang.String SUBTYPE_MAX = "max";

    field public static final java.lang.String SUBTYPE_MESSAGE = "message";

    field public static final java.lang.String SUBTYPE_MILLIS = "millis";

    field public static final java.lang.String SUBTYPE_PRIORITY = "priority";

    field public static final java.lang.String SUBTYPE_RANGE = "range";

    field public static final deprecated java.lang.String SUBTYPE_SLIDER = "slider";

core/java/android/app/slice/Slice.java

+17 −2
Original line number Diff line number Diff line
@@ -66,8 +66,10 @@ public final class Slice implements Parcelable { 
            HINT_HORIZONTAL,

            HINT_PARTIAL,

            HINT_SEE_MORE,

            HINT_KEY_WORDS,

            HINT_KEYWORDS,

            HINT_ERROR,

            HINT_TTL,

            HINT_LAST_UPDATED,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface SliceHint {}
@@ -168,11 +170,19 @@ public final class Slice implements Parcelable { 
     * related to the parent slice.

     * Expected to be on an item of format {@link SliceItem#FORMAT_SLICE}.

     */

    public static final String HINT_KEY_WORDS = "key_words";

    public static final String HINT_KEYWORDS = "keywords";

    /**

     * A hint to indicate that this slice represents an error.

     */

    public static final String HINT_ERROR = "error";

    /**

     * Hint indicating an item representing a time-to-live for the content.

     */

    public static final String HINT_TTL = "ttl";

    /**

     * Hint indicating an item representing when the content was created or last updated.

     */

    public static final String HINT_LAST_UPDATED = "last_updated";

    /**

     * Key to retrieve an extra added to an intent when a control is changed.

     */
@@ -243,6 +253,11 @@ public final class Slice implements Parcelable { 
     * Expected to be on an item of format {@link SliceItem#FORMAT_TEXT}.

     */

    public static final String SUBTYPE_CONTENT_DESCRIPTION = "content_description";

    /**

     * Subtype to tag an item as representing a time in milliseconds since midnight,

     * January 1, 1970 UTC.

     */

    public static final String SUBTYPE_MILLIS = "millis";



    private final SliceItem[] mItems;

    private final @SliceHint String[] mHints;