diff options
| author | 2018-01-21 15:21:55 -0500 | |
|---|---|---|
| committer | 2018-01-21 15:31:16 -0500 | |
| commit | 888a664ad6bb7248125df90433c23ccb16474f24 (patch) | |
| tree | 0c0c6464d053720057512c6243c5ea9cbd865ecb | |
| parent | 6ebcfe310919af87b87b534e149a22523aba0e2f (diff) | |
Remove old slice APIs for color
Everyone is using ints now.
Test: update-api
Bug: 68378574
Change-Id: I9b379386fec4979dfe15ea520fc3f8541c2e2a04
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/app/slice/Slice.java | 22 | ||||
| -rw-r--r-- | core/java/android/app/slice/SliceItem.java | 12 |
3 files changed, 0 insertions, 38 deletions
diff --git a/api/current.txt b/api/current.txt index 3e4dfd217dcc..89f1a28808e0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7127,8 +7127,6 @@ package android.app.slice { 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 addBundle(android.os.Bundle, java.lang.String, java.lang.String...); method public android.app.slice.Slice.Builder addBundle(android.os.Bundle, java.lang.String, java.util.List<java.lang.String>); - method public deprecated android.app.slice.Slice.Builder addColor(int, java.lang.String, java.lang.String...); - method public deprecated 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, java.lang.String...); @@ -7151,7 +7149,6 @@ package android.app.slice { method public int describeContents(); method public android.app.PendingIntent getAction(); method public android.os.Bundle getBundle(); - method public deprecated int getColor(); method public java.lang.String getFormat(); method public java.util.List<java.lang.String> getHints(); method public android.graphics.drawable.Icon getIcon(); @@ -7166,7 +7163,6 @@ package android.app.slice { field public static final android.os.Parcelable.Creator<android.app.slice.SliceItem> CREATOR; field public static final java.lang.String FORMAT_ACTION = "action"; field public static final java.lang.String FORMAT_BUNDLE = "bundle"; - field public static final deprecated java.lang.String FORMAT_COLOR = "color"; field public static final java.lang.String FORMAT_IMAGE = "image"; field public static final java.lang.String FORMAT_INT = "int"; field public static final java.lang.String FORMAT_REMOTE_INPUT = "input"; diff --git a/core/java/android/app/slice/Slice.java b/core/java/android/app/slice/Slice.java index 6093a4a02fbe..2ae3c4e9aeb3 100644 --- a/core/java/android/app/slice/Slice.java +++ b/core/java/android/app/slice/Slice.java @@ -422,28 +422,6 @@ public final class Slice implements Parcelable { * Add a color to the slice being constructed * @param subType Optional template-specific type information * @see {@link SliceItem#getSubType()} - * @deprecated will be removed once supportlib updates - */ - public Builder addColor(int color, @Nullable String subType, @SliceHint String... hints) { - mItems.add(new SliceItem(color, SliceItem.FORMAT_INT, subType, hints)); - return this; - } - - /** - * Add a color to the slice being constructed - * @param subType Optional template-specific type information - * @see {@link SliceItem#getSubType()} - * @deprecated will be removed once supportlib updates - */ - public Builder addColor(int color, @Nullable String subType, - @SliceHint List<String> hints) { - return addColor(color, subType, hints.toArray(new String[hints.size()])); - } - - /** - * Add a color to the slice being constructed - * @param subType Optional template-specific type information - * @see {@link SliceItem#getSubType()} */ public Builder addInt(int value, @Nullable String subType, @SliceHint String... hints) { mItems.add(new SliceItem(value, SliceItem.FORMAT_INT, subType, hints)); diff --git a/core/java/android/app/slice/SliceItem.java b/core/java/android/app/slice/SliceItem.java index bcfd413fb823..9eb2bb896356 100644 --- a/core/java/android/app/slice/SliceItem.java +++ b/core/java/android/app/slice/SliceItem.java @@ -98,11 +98,6 @@ public final class SliceItem implements Parcelable { */ public static final String FORMAT_INT = "int"; /** - * A {@link SliceItem} that contains an int. - * @deprecated to be removed - */ - public static final String FORMAT_COLOR = "color"; - /** * A {@link SliceItem} that contains a timestamp. */ public static final String FORMAT_TIMESTAMP = "timestamp"; @@ -231,13 +226,6 @@ public final class SliceItem implements Parcelable { } /** - * @deprecated to be removed. - */ - public int getColor() { - return (Integer) mObj; - } - - /** * @return The slice held by this {@link #FORMAT_ACTION} or {@link #FORMAT_SLICE} SliceItem */ public Slice getSlice() { |