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

Commit d937d4b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update slice constants for range/input range."

parents 827aa57f 60593c24

api/current.txt

+4 −2
Original line number Original line Diff line number Diff line
@@ -7161,7 +7161,8 @@ package android.app.slice { 
    method public android.net.Uri getUri();

    method public android.net.Uri getUri();

    method public void writeToParcel(android.os.Parcel, int);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.slice.Slice> CREATOR;

    field public static final android.os.Parcelable.Creator<android.app.slice.Slice> CREATOR;

    field public static final java.lang.String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";

    field public static final java.lang.String EXTRA_RANGE_VALUE = "android.app.slice.extra.RANGE_VALUE";

    field public static final deprecated java.lang.String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";

    field public static final java.lang.String EXTRA_TOGGLE_STATE = "android.app.slice.extra.TOGGLE_STATE";

    field public static final java.lang.String EXTRA_TOGGLE_STATE = "android.app.slice.extra.TOGGLE_STATE";

    field public static final java.lang.String HINT_ACTIONS = "actions";

    field public static final java.lang.String HINT_ACTIONS = "actions";

    field public static final java.lang.String HINT_CALLER_NEEDED = "caller_needed";

    field public static final java.lang.String HINT_CALLER_NEEDED = "caller_needed";
@@ -7181,7 +7182,8 @@ package android.app.slice { 
    field public static final java.lang.String SUBTYPE_MAX = "max";

    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_MESSAGE = "message";

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

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

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

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

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

    field public static final java.lang.String SUBTYPE_SOURCE = "source";

    field public static final java.lang.String SUBTYPE_SOURCE = "source";

    field public static final java.lang.String SUBTYPE_TOGGLE = "toggle";

    field public static final java.lang.String SUBTYPE_TOGGLE = "toggle";

    field public static final java.lang.String SUBTYPE_VALUE = "value";

    field public static final java.lang.String SUBTYPE_VALUE = "value";

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

+14 −2
Original line number Original line Diff line number Diff line
@@ -164,8 +164,14 @@ public final class Slice implements Parcelable { 
    public static final String EXTRA_TOGGLE_STATE = "android.app.slice.extra.TOGGLE_STATE";

    public static final String EXTRA_TOGGLE_STATE = "android.app.slice.extra.TOGGLE_STATE";

    /**

    /**

     * Key to retrieve an extra added to an intent when the value of a slider is changed.

     * Key to retrieve an extra added to an intent when the value of a slider is changed.

     * @deprecated remove once support lib is update to use EXTRA_RANGE_VALUE instead

     */

     */

    @Deprecated

    public static final String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";

    public static final String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";

    /**

     * Key to retrieve an extra added to an intent when the value of an input range is changed.

     */

    public static final String EXTRA_RANGE_VALUE = "android.app.slice.extra.RANGE_VALUE";

    /**

    /**

     * Subtype to indicate that this is a message as part of a communication

     * Subtype to indicate that this is a message as part of a communication

     * sequence in this slice.

     * sequence in this slice.
@@ -181,14 +187,20 @@ public final class Slice implements Parcelable { 
    public static final String SUBTYPE_COLOR = "color";

    public static final String SUBTYPE_COLOR = "color";

    /**

    /**

     * Subtype to tag an item as representing a slider.

     * Subtype to tag an item as representing a slider.

     * @deprecated remove once support lib is update to use SUBTYPE_RANGE instead

     */

     */

    @Deprecated

    public static final String SUBTYPE_SLIDER = "slider";

    public static final String SUBTYPE_SLIDER = "slider";

    /**

    /**

     * Subtype to tag an item as representing the max int value for a {@link #SUBTYPE_SLIDER}.

     * Subtype to tag an item as representing a range.

     */

    public static final String SUBTYPE_RANGE = "range";

    /**

     * Subtype to tag an item as representing the max int value for a {@link #SUBTYPE_RANGE}.

     */

     */

    public static final String SUBTYPE_MAX = "max";

    public static final String SUBTYPE_MAX = "max";

    /**

    /**

     * Subtype to tag an item as representing the current int value for a {@link #SUBTYPE_SLIDER}.

     * Subtype to tag an item as representing the current int value for a {@link #SUBTYPE_RANGE}.

     */

     */

    public static final String SUBTYPE_VALUE = "value";

    public static final String SUBTYPE_VALUE = "value";

    /**

    /**