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

Commit dbbffe39 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Add subtype for layout direction to Slice" into pi-dev 

am: 703f31db

Change-Id: I2a9728249f2fac47593075dbe08d54988df82634
parents 5708929c 703f31db

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7226,6 +7226,7 @@ package android.app.slice { 
    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_LAYOUT_DIRECTION = "layout_direction";

    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";

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

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public final class Slice implements Parcelable { 
            SUBTYPE_SOURCE,

            SUBTYPE_TOGGLE,

            SUBTYPE_VALUE,

            SUBTYPE_LAYOUT_DIRECTION,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface SliceSubtype {}
@@ -189,6 +190,12 @@ public final class Slice implements Parcelable { 
     * slices.

     */

    public static final String HINT_PERMISSION_REQUEST = "permission_request";

    /**

     * Subtype to indicate that this item indicates the layout direction for content

     * in the slice.

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

     */

    public static final String SUBTYPE_LAYOUT_DIRECTION = "layout_direction";

    /**

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

     */