Merge "Remove SliceView (its moving to support)" (62db7bea) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −21

Original line number	Diff line number	Diff line
		@@ -7053,27 +7053,6 @@ package android.app.slice {

		}

		package android.app.slice.widget {

		public class SliceView extends android.view.ViewGroup {
		ctor public SliceView(android.content.Context);
		ctor public SliceView(android.content.Context, android.util.AttributeSet);
		ctor public SliceView(android.content.Context, android.util.AttributeSet, int);
		ctor public SliceView(android.content.Context, android.util.AttributeSet, int, int);
		method public void clearSlice();
		method public java.lang.String getMode();
		method protected void onLayout(boolean, int, int, int, int);
		method public void setMode(java.lang.String);
		method public void setScrollable(boolean);
		method public boolean setSlice(android.net.Uri);
		method public void showSlice(android.app.slice.Slice);
		field public static final java.lang.String MODE_LARGE = "SLICE_LARGE";
		field public static final java.lang.String MODE_SHORTCUT = "SLICE_ICON";
		field public static final java.lang.String MODE_SMALL = "SLICE_SMALL";
		}

		}

		package android.app.usage {

		public final class ConfigurationStats implements android.os.Parcelable {

+0 −21

Original line number	Diff line number	Diff line
		@@ -7497,27 +7497,6 @@ package android.app.slice {

		}

		package android.app.slice.widget {

		public class SliceView extends android.view.ViewGroup {
		ctor public SliceView(android.content.Context);
		ctor public SliceView(android.content.Context, android.util.AttributeSet);
		ctor public SliceView(android.content.Context, android.util.AttributeSet, int);
		ctor public SliceView(android.content.Context, android.util.AttributeSet, int, int);
		method public void clearSlice();
		method public java.lang.String getMode();
		method protected void onLayout(boolean, int, int, int, int);
		method public void setMode(java.lang.String);
		method public void setScrollable(boolean);
		method public boolean setSlice(android.net.Uri);
		method public void showSlice(android.app.slice.Slice);
		field public static final java.lang.String MODE_LARGE = "SLICE_LARGE";
		field public static final java.lang.String MODE_SHORTCUT = "SLICE_ICON";
		field public static final java.lang.String MODE_SMALL = "SLICE_SMALL";
		}

		}

		package android.app.usage {

		public final class CacheQuotaHint implements android.os.Parcelable {

+0 −21

Original line number	Diff line number	Diff line
		@@ -7127,27 +7127,6 @@ package android.app.slice {

		}

		package android.app.slice.widget {

		public class SliceView extends android.view.ViewGroup {
		ctor public SliceView(android.content.Context);
		ctor public SliceView(android.content.Context, android.util.AttributeSet);
		ctor public SliceView(android.content.Context, android.util.AttributeSet, int);
		ctor public SliceView(android.content.Context, android.util.AttributeSet, int, int);
		method public void clearSlice();
		method public java.lang.String getMode();
		method protected void onLayout(boolean, int, int, int, int);
		method public void setMode(java.lang.String);
		method public void setScrollable(boolean);
		method public boolean setSlice(android.net.Uri);
		method public void showSlice(android.app.slice.Slice);
		field public static final java.lang.String MODE_LARGE = "SLICE_LARGE";
		field public static final java.lang.String MODE_SHORTCUT = "SLICE_ICON";
		field public static final java.lang.String MODE_SMALL = "SLICE_SMALL";
		}

		}

		package android.app.usage {

		public final class ConfigurationStats implements android.os.Parcelable {

+3 −4

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ public final class Slice implements Parcelable {
		* the content should be used in the shortcut representation of the slice (icon, label, action),
		* normally this should be indicated by adding the hint on the action containing that content.
		*
		* @see SliceView#MODE_SHORTCUT
		* @see SliceItem#TYPE_ACTION
		*/
		public static final String HINT_TITLE = "title";
		@@ -109,9 +108,9 @@ public final class Slice implements Parcelable {
		*/
		public static final String HINT_NO_TINT = "no_tint";
		/**
		* Hint to indicate that this content should not be shown in the {@link SliceView#MODE_SMALL}
		* and {@link SliceView#MODE_LARGE} modes of SliceView. This content may be used to populate
		* the {@link SliceView#MODE_SHORTCUT} format of the slice.
		* Hint to indicate that this content should not be shown in larger renderings
		* of Slices. This content may be used to populate the shortcut/icon
		* format of the slice.
		* @hide
		*/
		public static final String HINT_HIDDEN = "hidden";

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package android.app.slice;

		import android.Manifest.permission;
		import android.annotation.NonNull;
		import android.app.slice.widget.SliceView;
		import android.content.ContentProvider;
		import android.content.ContentResolver;
		import android.content.ContentValues;
		@@ -132,7 +131,6 @@ public abstract class SliceProvider extends ContentProvider {
		*
		* @return Uri representing the slice associated with the provided intent.
		* @see {@link Slice}
		* @see {@link SliceView#setSlice(Intent)}
		*/
		public @NonNull Uri onMapIntentToUri(Intent intent) {
		throw new UnsupportedOperationException(