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

Commit 03be3038 authored by Anton Hansson's avatar Anton Hansson
Browse files

Delete removed-at-birth Slice APIs 

These APIs never shipped in a final SDK, but were marked @removed
instead of actually removed (to maintain compatibility with DPs).

It's been a while, so just delete them now.

- added in ag/3471192, ag/3341989, ag/3181753, ag/3463807 and ag/3345779
- @removed in ag/3881834

Bug: 155877914
Test: m
Change-Id: Id0775f9de7354860fb6ee39a7cf6f173834c2984
parent 54fb3a04

core/api/removed.txt

+0 −30
Original line number Diff line number Diff line
@@ -30,36 +30,6 @@ package android.app { 


}



package android.app.slice {



  public final class Slice implements android.os.Parcelable {

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

    field @Deprecated public static final String SUBTYPE_SLIDER = "slider";

  }



  public static class Slice.Builder {

    ctor @Deprecated public Slice.Builder(@NonNull android.net.Uri);

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

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

  }



  public final class SliceItem implements android.os.Parcelable {

    method @Deprecated public long getTimestamp();

    field @Deprecated public static final String FORMAT_TIMESTAMP = "long";

  }



  public class SliceManager {

    method @Deprecated @Nullable public android.app.slice.Slice bindSlice(@NonNull android.net.Uri, @NonNull java.util.List<android.app.slice.SliceSpec>);

    method @Deprecated @Nullable public android.app.slice.Slice bindSlice(@NonNull android.content.Intent, @NonNull java.util.List<android.app.slice.SliceSpec>);

    method @Deprecated public void pinSlice(@NonNull android.net.Uri, @NonNull java.util.List<android.app.slice.SliceSpec>);

  }



  public abstract class SliceProvider extends android.content.ContentProvider {

    method @Deprecated public android.app.slice.Slice onBindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);

  }



}



package android.app.usage {



  public class StorageStatsManager {

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

+0 −42
Original line number Diff line number Diff line
@@ -194,13 +194,6 @@ 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.

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

     * @removed

     */

    @Deprecated

    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.

     */
@@ -222,13 +215,6 @@ public final class Slice implements Parcelable { 
     * Expected to be on an item of format {@link SliceItem#FORMAT_INT}.

     */

    public static final String SUBTYPE_COLOR = "color";

    /**

     * Subtype to tag an item as representing a slider.

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

     * @removed

     */

    @Deprecated

    public static final String SUBTYPE_SLIDER = "slider";

    /**

     * Subtype to tag an item as representing a range.

     * Expected to be on an item of format {@link SliceItem#FORMAT_SLICE} containing
@@ -360,15 +346,6 @@ public final class Slice implements Parcelable { 
        private @SliceHint ArrayList<String> mHints = new ArrayList<>();

        private SliceSpec mSpec;



        /**

         * @deprecated TO BE REMOVED

         * @removed

         */

        @Deprecated

        public Builder(@NonNull Uri uri) {

            mUri = uri;

        }



        /**

         * Create a builder which will construct a {@link Slice} for the given Uri.

         * @param uri Uri to tag for this slice.
@@ -412,15 +389,6 @@ public final class Slice implements Parcelable { 
            return this;

        }



        /**

         * @deprecated TO BE REMOVED

         * @removed

         */

        public Builder setSpec(SliceSpec spec) {

            mSpec = spec;

            return this;

        }



        /**

         * Add a sub-slice to the slice being constructed

         * @param subType Optional template-specific type information
@@ -497,16 +465,6 @@ public final class Slice implements Parcelable { 
            return this;

        }



        /**

         * @deprecated TO BE REMOVED.

         * @removed

         */

        @Deprecated

        public Slice.Builder addTimestamp(long time, @Nullable @SliceSubtype String subType,

                @SliceHint List<String> hints) {

            return addLong(time, subType, hints);

        }



        /**

         * Add a long to the slice being constructed

         * @param subType Optional template-specific type information

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

+2 −17
Original line number Diff line number Diff line
@@ -101,12 +101,6 @@ public final class SliceItem implements Parcelable { 
     * A {@link SliceItem} that contains a long.

     */

    public static final String FORMAT_LONG = "long";

    /**

     * @deprecated TO BE REMOVED

     * @removed

     */

    @Deprecated

    public static final String FORMAT_TIMESTAMP = FORMAT_LONG;

    /**

     * A {@link SliceItem} that contains a {@link RemoteInput}.

     */
@@ -256,15 +250,6 @@ public final class SliceItem implements Parcelable { 
        return (Long) mObj;

    }



    /**

     * @deprecated replaced by {@link #getLong()}

     * @removed

     */

    @Deprecated

    public long getTimestamp() {

        return (Long) mObj;

    }



    /**

     * @param hint The hint to check for

     * @return true if this item contains the given hint
@@ -348,7 +333,7 @@ public final class SliceItem implements Parcelable { 
            case FORMAT_INT:

                dest.writeInt((Integer) obj);

                break;

            case FORMAT_TIMESTAMP:

            case FORMAT_LONG:

                dest.writeLong((Long) obj);

                break;

        }
@@ -368,7 +353,7 @@ public final class SliceItem implements Parcelable { 
                        Slice.CREATOR.createFromParcel(in));

            case FORMAT_INT:

                return in.readInt();

            case FORMAT_TIMESTAMP:

            case FORMAT_LONG:

                return in.readLong();

            case FORMAT_REMOTE_INPUT:

                return RemoteInput.CREATOR.createFromParcel(in);

core/java/android/app/slice/SliceManager.java

+0 −29
Original line number Diff line number Diff line
@@ -140,15 +140,6 @@ public class SliceManager { 
        }

    }



    /**

     * @deprecated TO BE REMOVED

     * @removed

     */

    @Deprecated

    public void pinSlice(@NonNull Uri uri, @NonNull List<SliceSpec> specs) {

        pinSlice(uri, new ArraySet<>(specs));

    }



    /**

     * Remove a pin for a slice.

     * <p>
@@ -272,15 +263,6 @@ public class SliceManager { 
        }

    }



    /**

     * @deprecated TO BE REMOVED

     * @removed

     */

    @Deprecated

    public @Nullable Slice bindSlice(@NonNull Uri uri, @NonNull List<SliceSpec> supportedSpecs) {

        return bindSlice(uri, new ArraySet<>(supportedSpecs));

    }



    /**

     * Turns a slice intent into a slice uri. Expects an explicit intent.

     * <p>
@@ -411,17 +393,6 @@ public class SliceManager { 
        }

    }



    /**

     * @deprecated TO BE REMOVED.

     * @removed

     */

    @Deprecated

    @Nullable

    public Slice bindSlice(@NonNull Intent intent,

            @NonNull List<SliceSpec> supportedSpecs) {

        return bindSlice(intent, new ArraySet<>(supportedSpecs));

    }



    /**

     * Determine whether a particular process and user ID has been granted

     * permission to access a specific slice URI.

core/java/android/app/slice/SliceProvider.java

+5 −13
Original line number Diff line number Diff line
@@ -209,15 +209,6 @@ public abstract class SliceProvider extends ContentProvider { 
     * @see Slice#HINT_PARTIAL

     */

    public Slice onBindSlice(Uri sliceUri, Set<SliceSpec> supportedSpecs) {

        return onBindSlice(sliceUri, new ArrayList<>(supportedSpecs));

    }



    /**

     * @deprecated TO BE REMOVED

     * @removed

     */

    @Deprecated

    public Slice onBindSlice(Uri sliceUri, List<SliceSpec> supportedSpecs) {

        return null;

    }
@@ -479,7 +470,7 @@ public abstract class SliceProvider extends ContentProvider { 
        } finally {

            Handler.getMain().removeCallbacks(mAnr);

        }

        Slice.Builder parent = new Slice.Builder(sliceUri);

        Slice.Builder parent = new Slice.Builder(sliceUri, null);

        Slice.Builder childAction = new Slice.Builder(parent)

                .addIcon(Icon.createWithResource(context,

                        com.android.internal.R.drawable.ic_permission), null,
@@ -492,7 +483,8 @@ public abstract class SliceProvider extends ContentProvider { 
                .getTheme().resolveAttribute(android.R.attr.colorAccent, tv, true);

        int deviceDefaultAccent = tv.data;



        parent.addSubSlice(new Slice.Builder(sliceUri.buildUpon().appendPath("permission").build())

        Uri subSliceUri = sliceUri.buildUpon().appendPath("permission").build();

        Slice.Builder subSlice = new Slice.Builder(subSliceUri, null)

                .addIcon(Icon.createWithResource(context,

                        com.android.internal.R.drawable.ic_arrow_forward), null,

                        Collections.emptyList())
@@ -500,8 +492,8 @@ public abstract class SliceProvider extends ContentProvider { 
                        Collections.emptyList())

                .addInt(deviceDefaultAccent, SUBTYPE_COLOR,

                        Collections.emptyList())

                .addSubSlice(childAction.build(), null)

                .build(), null);

                .addSubSlice(childAction.build(), null);

        parent.addSubSlice(subSlice.build(), null);

        return parent.addHints(Arrays.asList(Slice.HINT_PERMISSION_REQUEST)).build();

    }