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

Commit dedcab0b authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Unhide slice view APIs"

parents 9e5f228a 800ba363
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -7039,6 +7039,27 @@ 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 {
+21 −0
Original line number Diff line number Diff line
@@ -7482,6 +7482,27 @@ 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 {
+21 −0
Original line number Diff line number Diff line
@@ -7110,6 +7110,27 @@ 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 −19
Original line number Diff line number Diff line
@@ -154,25 +154,6 @@ public final class Slice implements Parcelable {
        return Arrays.asList(mHints);
    }

    /**
     * @hide
     */
    public SliceItem getPrimaryIcon() {
        for (SliceItem item : getItems()) {
            if (item.getType() == SliceItem.TYPE_IMAGE) {
                return item;
            }
            if (!(item.getType() == SliceItem.TYPE_SLICE && item.hasHint(Slice.HINT_LIST))
                    && !item.hasHint(Slice.HINT_ACTIONS)
                    && !item.hasHint(Slice.HINT_LIST_ITEM)
                    && (item.getType() != SliceItem.TYPE_ACTION)) {
                SliceItem icon = SliceQuery.find(item, SliceItem.TYPE_IMAGE);
                if (icon != null) return icon;
            }
        }
        return null;
    }

    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeStringArray(mHints);
@@ -405,6 +386,9 @@ public final class Slice implements Parcelable {
            final Bundle res = provider.call(resolver.getPackageName(), SliceProvider.METHOD_SLICE,
                    null, extras);
            Bundle.setDefusable(res, true);
            if (res == null) {
                return null;
            }
            return res.getParcelable(SliceProvider.EXTRA_SLICE);
        } catch (RemoteException e) {
            // Arbitrary and not worth documenting, as Activity
+21 −0
Original line number Diff line number Diff line
@@ -32,6 +32,27 @@ import java.util.stream.StreamSupport;
public class SliceQuery {
    private static final String TAG = "SliceQuery";

    /**
     * @hide
     */
    public static SliceItem getPrimaryIcon(Slice slice) {
        for (SliceItem item : slice.getItems()) {
            if (item.getType() == SliceItem.TYPE_IMAGE) {
                return item;
            }
            if (!(item.getType() == SliceItem.TYPE_SLICE && item.hasHint(Slice.HINT_LIST))
                    && !item.hasHint(Slice.HINT_ACTIONS)
                    && !item.hasHint(Slice.HINT_LIST_ITEM)
                    && (item.getType() != SliceItem.TYPE_ACTION)) {
                SliceItem icon = SliceQuery.find(item, SliceItem.TYPE_IMAGE);
                if (icon != null) {
                    return icon;
                }
            }
        }
        return null;
    }

    /**
     * @hide
     */
Loading