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

Commit d054fb36 authored by Jason Monk's avatar Jason Monk
Browse files

Convert Slice type to string and add optional sub-type 

The type will control the serialization that the platform uses to
get the object from one place to another. The sub-type optionally
will specify a specific interpretation of this object.

Test: cts
Bug: 68378558
Change-Id: I78f41f6e5b6c91c510e4f968c32d96e9030d0e8a
parent 2af1998e

api/current.txt

+23 −20
Original line number Diff line number Diff line
@@ -6987,31 +6987,33 @@ 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_MESSAGE = "message";

    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_SELECTED = "selected";

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

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

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

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

  }















  public static class Slice.Builder {















    ctor public Slice.Builder(android.net.Uri);















    ctor public Slice.Builder(android.app.slice.Slice.Builder);















    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String...);













    method public android.app.slice.Slice.Builder addColor(int, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice, java.lang.String);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice.Builder addHints(java.lang.String...);















    method public android.app.slice.Slice.Builder addHints(java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.lang.String...);















    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String...);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String...);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice, java.lang.String);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice build();















    method public android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);















  }









@@ -7020,23 +7022,24 @@ package android.app.slice {













    method public int describeContents();















    method public android.app.PendingIntent getAction();















    method public int getColor();













    method public java.lang.String getFormat();















    method public java.util.List<java.lang.String> getHints();















    method public android.graphics.drawable.Icon getIcon();















    method public android.app.RemoteInput getRemoteInput();















    method public android.app.slice.Slice getSlice();













    method public java.lang.String getSubType();















    method public java.lang.CharSequence getText();















    method public long getTimestamp();













    method public int getType();















    method public boolean hasHint(java.lang.String);















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















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













    field public static final int TYPE_ACTION = 4; // 0x4













    field public static final int TYPE_COLOR = 6; // 0x6













    field public static final int TYPE_IMAGE = 3; // 0x3













    field public static final int TYPE_REMOTE_INPUT = 9; // 0x9













    field public static final int TYPE_SLICE = 1; // 0x1













    field public static final int TYPE_TEXT = 2; // 0x2













    field public static final int TYPE_TIMESTAMP = 8; // 0x8













    field public static final java.lang.String FORMAT_ACTION = "action";













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













    field public static final java.lang.String FORMAT_IMAGE = "image";













    field public static final java.lang.String FORMAT_REMOTE_INPUT = "input";













    field public static final java.lang.String FORMAT_SLICE = "slice";













    field public static final java.lang.String FORMAT_TEXT = "text";













    field public static final java.lang.String FORMAT_TIMESTAMP = "timestamp";















  }





























  public abstract class SliceProvider extends android.content.ContentProvider {

























api/system-current.txt



+23
−20




























Original line number
Diff line number
Diff line








@@ -7431,31 +7431,33 @@ 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_MESSAGE = "message";















    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_SELECTED = "selected";













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















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













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













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















  }





























  public static class Slice.Builder {















    ctor public Slice.Builder(android.net.Uri);















    ctor public Slice.Builder(android.app.slice.Slice.Builder);















    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String...);













    method public android.app.slice.Slice.Builder addColor(int, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice, java.lang.String);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice.Builder addHints(java.lang.String...);















    method public android.app.slice.Slice.Builder addHints(java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.lang.String...);















    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String...);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String...);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice, java.lang.String);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice build();















    method public android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);















  }









@@ -7464,23 +7466,24 @@ package android.app.slice {













    method public int describeContents();















    method public android.app.PendingIntent getAction();















    method public int getColor();













    method public java.lang.String getFormat();















    method public java.util.List<java.lang.String> getHints();















    method public android.graphics.drawable.Icon getIcon();















    method public android.app.RemoteInput getRemoteInput();















    method public android.app.slice.Slice getSlice();













    method public java.lang.String getSubType();















    method public java.lang.CharSequence getText();















    method public long getTimestamp();













    method public int getType();















    method public boolean hasHint(java.lang.String);















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















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













    field public static final int TYPE_ACTION = 4; // 0x4













    field public static final int TYPE_COLOR = 6; // 0x6













    field public static final int TYPE_IMAGE = 3; // 0x3













    field public static final int TYPE_REMOTE_INPUT = 9; // 0x9













    field public static final int TYPE_SLICE = 1; // 0x1













    field public static final int TYPE_TEXT = 2; // 0x2













    field public static final int TYPE_TIMESTAMP = 8; // 0x8













    field public static final java.lang.String FORMAT_ACTION = "action";













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













    field public static final java.lang.String FORMAT_IMAGE = "image";













    field public static final java.lang.String FORMAT_REMOTE_INPUT = "input";













    field public static final java.lang.String FORMAT_SLICE = "slice";













    field public static final java.lang.String FORMAT_TEXT = "text";













    field public static final java.lang.String FORMAT_TIMESTAMP = "timestamp";















  }





























  public abstract class SliceProvider extends android.content.ContentProvider {

























api/test-current.txt



+23
−20




























Original line number
Diff line number
Diff line








@@ -7061,31 +7061,33 @@ 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_MESSAGE = "message";















    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_SELECTED = "selected";













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















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













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













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















  }





























  public static class Slice.Builder {















    ctor public Slice.Builder(android.net.Uri);















    ctor public Slice.Builder(android.app.slice.Slice.Builder);















    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String...);













    method public android.app.slice.Slice.Builder addColor(int, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice, java.lang.String);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addColor(int, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice.Builder addHints(java.lang.String...);















    method public android.app.slice.Slice.Builder addHints(java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.lang.String...);















    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String...);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String...);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice, java.lang.String);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.util.List<java.lang.String>);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.lang.String...);













    method public android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice build();















    method public android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);















  }









@@ -7094,23 +7096,24 @@ package android.app.slice {













    method public int describeContents();















    method public android.app.PendingIntent getAction();















    method public int getColor();













    method public java.lang.String getFormat();















    method public java.util.List<java.lang.String> getHints();















    method public android.graphics.drawable.Icon getIcon();















    method public android.app.RemoteInput getRemoteInput();















    method public android.app.slice.Slice getSlice();













    method public java.lang.String getSubType();















    method public java.lang.CharSequence getText();















    method public long getTimestamp();













    method public int getType();















    method public boolean hasHint(java.lang.String);















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















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













    field public static final int TYPE_ACTION = 4; // 0x4













    field public static final int TYPE_COLOR = 6; // 0x6













    field public static final int TYPE_IMAGE = 3; // 0x3













    field public static final int TYPE_REMOTE_INPUT = 9; // 0x9













    field public static final int TYPE_SLICE = 1; // 0x1













    field public static final int TYPE_TEXT = 2; // 0x2













    field public static final int TYPE_TIMESTAMP = 8; // 0x8













    field public static final java.lang.String FORMAT_ACTION = "action";













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













    field public static final java.lang.String FORMAT_IMAGE = "image";













    field public static final java.lang.String FORMAT_REMOTE_INPUT = "input";













    field public static final java.lang.String FORMAT_SLICE = "slice";













    field public static final java.lang.String FORMAT_TEXT = "text";













    field public static final java.lang.String FORMAT_TIMESTAMP = "timestamp";















  }





























  public abstract class SliceProvider extends android.content.ContentProvider {

























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



+90
−59


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/slice/SliceItem.java



+97
−90


























File changed.
Preview size limit exceeded, changes collapsed.