Merge "Add slice subtype constants for sliders/progress." (bd2f2e99) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -7134,6 +7134,7 @@ package android.app.slice {
		method public android.net.Uri getUri();
		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 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 HINT_ACTIONS = "actions";
		field public static final java.lang.String HINT_CALLER_NEEDED = "caller_needed";
		@@ -7141,7 +7142,6 @@ package android.app.slice {
		field public static final java.lang.String HINT_LARGE = "large";
		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_MAX = "max";
		field public static final java.lang.String HINT_NO_TINT = "no_tint";
		field public static final java.lang.String HINT_PARTIAL = "partial";
		field public static final java.lang.String HINT_SEE_MORE = "see_more";
		@@ -7151,11 +7151,13 @@ package android.app.slice {
		field public static final java.lang.String HINT_TITLE = "title";
		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_PRIORITY = "priority";
		field public static final java.lang.String SUBTYPE_SLIDER = "slider";
		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_VALUE = "value";
		}

		public static class Slice.Builder {

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

+13 −6

Original line number	Diff line number	Diff line
		@@ -145,11 +145,6 @@ public final class Slice implements Parcelable {
		* OS and should not be cached by apps.
		*/
		public static final String HINT_PARTIAL = "partial";
		/**
		* A hint representing that this item is the max value possible for the slice containing this.
		* Used to indicate the maximum integer value for a {@link #SUBTYPE_SLIDER}.
		*/
		public static final String HINT_MAX = "max";
		/**
		* A hint representing that this item should be used to indicate that there's more
		* content associated with this slice.
		@@ -167,6 +162,10 @@ public final class Slice implements Parcelable {
		* Key to retrieve an extra added to an intent when a control is changed.
		*/
		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.
		*/
		public static final String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";
		/**
		* Subtype to indicate that this is a message as part of a communication
		* sequence in this slice.
		@@ -181,9 +180,17 @@ public final class Slice implements Parcelable {
		*/
		public static final String SUBTYPE_COLOR = "color";
		/**
		* Subtype to tag an item represents a slider.
		* Subtype to tag an item as representing a slider.
		*/
		public static final String SUBTYPE_SLIDER = "slider";
		/**
		* Subtype to tag an item as representing the max int value for a {@link #SUBTYPE_SLIDER}.
		*/
		public static final String SUBTYPE_MAX = "max";
		/**
		* Subtype to tag an item as representing the current int value for a {@link #SUBTYPE_SLIDER}.
		*/
		public static final String SUBTYPE_VALUE = "value";
		/**
		* Subtype to indicate that this content has a toggle action associated with it. To indicate
		* that the toggle is on, use {@link #HINT_SELECTED}. When the toggle state changes, the