Merge "Move slices to androidx.slice package." into pi-preview1-androidx-dev
diff --git a/samples/SupportSliceDemos/src/main/AndroidManifest.xml b/samples/SupportSliceDemos/src/main/AndroidManifest.xml
index 5285c34..355a77a 100644
--- a/samples/SupportSliceDemos/src/main/AndroidManifest.xml
+++ b/samples/SupportSliceDemos/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.example.androidx.slice.demos">
- <uses-sdk tools:overrideLibrary="androidx.app.slice.view, androidx.app.slice.builders, androidx.app.slice.core" />
+ <uses-sdk tools:overrideLibrary="androidx.slice.view, androidx.slice.builders, androidx.slice.core" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.BIND_SLICE" />
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
index d845b72..1df92f9 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
@@ -34,12 +34,12 @@
import java.util.Calendar;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceProvider;
-import androidx.app.slice.builders.GridBuilder;
-import androidx.app.slice.builders.ListBuilder;
-import androidx.app.slice.builders.MessagingSliceBuilder;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.builders.GridBuilder;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.MessagingSliceBuilder;
+import androidx.slice.builders.SliceAction;
/**
* Examples of using slice template builders.
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
index 9e87dc0..163f6de 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
@@ -17,9 +17,11 @@
package com.example.androidx.slice.demos;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-import static androidx.app.slice.core.SliceHints.EXTRA_RANGE_VALUE;
+
import static com.example.androidx.slice.demos.SampleSliceProvider.getUri;
+import static androidx.slice.core.SliceHints.EXTRA_RANGE_VALUE;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java
index b4bb353..c7751c4 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java
@@ -49,11 +49,11 @@
import java.util.Comparator;
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.widget.EventInfo;
-import androidx.app.slice.widget.SliceLiveData;
-import androidx.app.slice.widget.SliceView;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.widget.EventInfo;
+import androidx.slice.widget.SliceLiveData;
+import androidx.slice.widget.SliceView;
/**
* Example use of SliceView. Uses a search bar to select/auto-complete a slice uri which is
diff --git a/samples/SupportSliceDemos/src/main/res/layout/slice_view.xml b/samples/SupportSliceDemos/src/main/res/layout/slice_view.xml
index 8d5eb61..36f6750 100644
--- a/samples/SupportSliceDemos/src/main/res/layout/slice_view.xml
+++ b/samples/SupportSliceDemos/src/main/res/layout/slice_view.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<androidx.app.slice.widget.SliceView
+<androidx.slice.widget.SliceView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/slices/builders/api/current.txt b/slices/builders/api/current.txt
index ccfc07f..6200f15 100644
--- a/slices/builders/api/current.txt
+++ b/slices/builders/api/current.txt
@@ -1,95 +1,95 @@
-package androidx.app.slice.builders {
+package androidx.slice.builders {
- public class GridBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
- ctor public GridBuilder(androidx.app.slice.builders.ListBuilder);
- method public androidx.app.slice.builders.GridBuilder addCell(androidx.app.slice.builders.GridBuilder.CellBuilder);
- method public androidx.app.slice.builders.GridBuilder addCell(java.util.function.Consumer<androidx.app.slice.builders.GridBuilder.CellBuilder>);
- method public androidx.app.slice.builders.GridBuilder addSeeMoreAction(android.app.PendingIntent);
- method public androidx.app.slice.builders.GridBuilder addSeeMoreCell(androidx.app.slice.builders.GridBuilder.CellBuilder);
- method public androidx.app.slice.builders.GridBuilder addSeeMoreCell(java.util.function.Consumer<androidx.app.slice.builders.GridBuilder.CellBuilder>);
- method public androidx.app.slice.builders.GridBuilder setPrimaryAction(androidx.app.slice.builders.SliceAction);
+ public class GridBuilder extends androidx.slice.builders.TemplateSliceBuilder {
+ ctor public GridBuilder(androidx.slice.builders.ListBuilder);
+ method public androidx.slice.builders.GridBuilder addCell(androidx.slice.builders.GridBuilder.CellBuilder);
+ method public androidx.slice.builders.GridBuilder addCell(java.util.function.Consumer<androidx.slice.builders.GridBuilder.CellBuilder>);
+ method public androidx.slice.builders.GridBuilder addSeeMoreAction(android.app.PendingIntent);
+ method public androidx.slice.builders.GridBuilder addSeeMoreCell(androidx.slice.builders.GridBuilder.CellBuilder);
+ method public androidx.slice.builders.GridBuilder addSeeMoreCell(java.util.function.Consumer<androidx.slice.builders.GridBuilder.CellBuilder>);
+ method public androidx.slice.builders.GridBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
field public static final int ICON_IMAGE = 0; // 0x0
field public static final int LARGE_IMAGE = 2; // 0x2
field public static final int SMALL_IMAGE = 1; // 0x1
}
- public static final class GridBuilder.CellBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
- ctor public GridBuilder.CellBuilder(androidx.app.slice.builders.GridBuilder);
- ctor public GridBuilder.CellBuilder(androidx.app.slice.builders.GridBuilder, android.net.Uri);
- method public deprecated androidx.app.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon);
- method public deprecated androidx.app.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon, boolean);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon, int);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon, int, boolean);
- method public deprecated androidx.app.slice.builders.GridBuilder.CellBuilder addLargeImage(android.graphics.drawable.Icon);
- method public deprecated androidx.app.slice.builders.GridBuilder.CellBuilder addLargeImage(android.graphics.drawable.Icon, boolean);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder addText(java.lang.CharSequence);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder addText(java.lang.CharSequence, boolean);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder addTitleText(java.lang.CharSequence);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder addTitleText(java.lang.CharSequence, boolean);
- method public androidx.app.slice.builders.GridBuilder.CellBuilder setContentIntent(android.app.PendingIntent);
+ public static final class GridBuilder.CellBuilder extends androidx.slice.builders.TemplateSliceBuilder {
+ ctor public GridBuilder.CellBuilder(androidx.slice.builders.GridBuilder);
+ ctor public GridBuilder.CellBuilder(androidx.slice.builders.GridBuilder, android.net.Uri);
+ method public deprecated androidx.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon);
+ method public deprecated androidx.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon, boolean);
+ method public androidx.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon, int);
+ method public androidx.slice.builders.GridBuilder.CellBuilder addImage(android.graphics.drawable.Icon, int, boolean);
+ method public deprecated androidx.slice.builders.GridBuilder.CellBuilder addLargeImage(android.graphics.drawable.Icon);
+ method public deprecated androidx.slice.builders.GridBuilder.CellBuilder addLargeImage(android.graphics.drawable.Icon, boolean);
+ method public androidx.slice.builders.GridBuilder.CellBuilder addText(java.lang.CharSequence);
+ method public androidx.slice.builders.GridBuilder.CellBuilder addText(java.lang.CharSequence, boolean);
+ method public androidx.slice.builders.GridBuilder.CellBuilder addTitleText(java.lang.CharSequence);
+ method public androidx.slice.builders.GridBuilder.CellBuilder addTitleText(java.lang.CharSequence, boolean);
+ method public androidx.slice.builders.GridBuilder.CellBuilder setContentIntent(android.app.PendingIntent);
}
- public class ListBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
+ public class ListBuilder extends androidx.slice.builders.TemplateSliceBuilder {
ctor public ListBuilder(android.content.Context, android.net.Uri);
- method public androidx.app.slice.builders.ListBuilder addAction(androidx.app.slice.builders.SliceAction);
- method public androidx.app.slice.builders.ListBuilder addGrid(androidx.app.slice.builders.GridBuilder);
- method public androidx.app.slice.builders.ListBuilder addGrid(java.util.function.Consumer<androidx.app.slice.builders.GridBuilder>);
- method public androidx.app.slice.builders.ListBuilder addInputRange(androidx.app.slice.builders.ListBuilder.InputRangeBuilder);
- method public androidx.app.slice.builders.ListBuilder addInputRange(java.util.function.Consumer<androidx.app.slice.builders.ListBuilder.InputRangeBuilder>);
- method public androidx.app.slice.builders.ListBuilder addRange(androidx.app.slice.builders.ListBuilder.RangeBuilder);
- method public androidx.app.slice.builders.ListBuilder addRange(java.util.function.Consumer<androidx.app.slice.builders.ListBuilder.RangeBuilder>);
- method public androidx.app.slice.builders.ListBuilder addRow(androidx.app.slice.builders.ListBuilder.RowBuilder);
- method public androidx.app.slice.builders.ListBuilder addRow(java.util.function.Consumer<androidx.app.slice.builders.ListBuilder.RowBuilder>);
- method public androidx.app.slice.builders.ListBuilder addSeeMoreAction(android.app.PendingIntent);
- method public androidx.app.slice.builders.ListBuilder addSeeMoreRow(androidx.app.slice.builders.ListBuilder.RowBuilder);
- method public androidx.app.slice.builders.ListBuilder addSeeMoreRow(java.util.function.Consumer<androidx.app.slice.builders.ListBuilder.RowBuilder>);
- method public androidx.app.slice.builders.ListBuilder setHeader(androidx.app.slice.builders.ListBuilder.HeaderBuilder);
- method public androidx.app.slice.builders.ListBuilder setHeader(java.util.function.Consumer<androidx.app.slice.builders.ListBuilder.HeaderBuilder>);
+ method public androidx.slice.builders.ListBuilder addAction(androidx.slice.builders.SliceAction);
+ method public androidx.slice.builders.ListBuilder addGrid(androidx.slice.builders.GridBuilder);
+ method public androidx.slice.builders.ListBuilder addGrid(java.util.function.Consumer<androidx.slice.builders.GridBuilder>);
+ method public androidx.slice.builders.ListBuilder addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder);
+ method public androidx.slice.builders.ListBuilder addInputRange(java.util.function.Consumer<androidx.slice.builders.ListBuilder.InputRangeBuilder>);
+ method public androidx.slice.builders.ListBuilder addRange(androidx.slice.builders.ListBuilder.RangeBuilder);
+ method public androidx.slice.builders.ListBuilder addRange(java.util.function.Consumer<androidx.slice.builders.ListBuilder.RangeBuilder>);
+ method public androidx.slice.builders.ListBuilder addRow(androidx.slice.builders.ListBuilder.RowBuilder);
+ method public androidx.slice.builders.ListBuilder addRow(java.util.function.Consumer<androidx.slice.builders.ListBuilder.RowBuilder>);
+ method public androidx.slice.builders.ListBuilder addSeeMoreAction(android.app.PendingIntent);
+ method public androidx.slice.builders.ListBuilder addSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder);
+ method public androidx.slice.builders.ListBuilder addSeeMoreRow(java.util.function.Consumer<androidx.slice.builders.ListBuilder.RowBuilder>);
+ method public androidx.slice.builders.ListBuilder setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder);
+ method public androidx.slice.builders.ListBuilder setHeader(java.util.function.Consumer<androidx.slice.builders.ListBuilder.HeaderBuilder>);
}
- public static class ListBuilder.HeaderBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
- ctor public ListBuilder.HeaderBuilder(androidx.app.slice.builders.ListBuilder);
- method public androidx.app.slice.builders.ListBuilder.HeaderBuilder setPrimaryAction(androidx.app.slice.builders.SliceAction);
- method public androidx.app.slice.builders.ListBuilder.HeaderBuilder setSubtitle(java.lang.CharSequence);
- method public androidx.app.slice.builders.ListBuilder.HeaderBuilder setSummarySubtitle(java.lang.CharSequence);
- method public androidx.app.slice.builders.ListBuilder.HeaderBuilder setTitle(java.lang.CharSequence);
+ public static class ListBuilder.HeaderBuilder extends androidx.slice.builders.TemplateSliceBuilder {
+ ctor public ListBuilder.HeaderBuilder(androidx.slice.builders.ListBuilder);
+ method public androidx.slice.builders.ListBuilder.HeaderBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
+ method public androidx.slice.builders.ListBuilder.HeaderBuilder setSubtitle(java.lang.CharSequence);
+ method public androidx.slice.builders.ListBuilder.HeaderBuilder setSummarySubtitle(java.lang.CharSequence);
+ method public androidx.slice.builders.ListBuilder.HeaderBuilder setTitle(java.lang.CharSequence);
}
- public static class ListBuilder.InputRangeBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
- ctor public ListBuilder.InputRangeBuilder(androidx.app.slice.builders.ListBuilder);
- method public androidx.app.slice.builders.ListBuilder.InputRangeBuilder setAction(android.app.PendingIntent);
- method public androidx.app.slice.builders.ListBuilder.InputRangeBuilder setMax(int);
- method public androidx.app.slice.builders.ListBuilder.InputRangeBuilder setThumb(android.graphics.drawable.Icon);
- method public androidx.app.slice.builders.ListBuilder.InputRangeBuilder setTitle(java.lang.CharSequence);
- method public androidx.app.slice.builders.ListBuilder.InputRangeBuilder setValue(int);
+ public static class ListBuilder.InputRangeBuilder extends androidx.slice.builders.TemplateSliceBuilder {
+ ctor public ListBuilder.InputRangeBuilder(androidx.slice.builders.ListBuilder);
+ method public androidx.slice.builders.ListBuilder.InputRangeBuilder setAction(android.app.PendingIntent);
+ method public androidx.slice.builders.ListBuilder.InputRangeBuilder setMax(int);
+ method public androidx.slice.builders.ListBuilder.InputRangeBuilder setThumb(android.graphics.drawable.Icon);
+ method public androidx.slice.builders.ListBuilder.InputRangeBuilder setTitle(java.lang.CharSequence);
+ method public androidx.slice.builders.ListBuilder.InputRangeBuilder setValue(int);
}
- public static class ListBuilder.RangeBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
- ctor public ListBuilder.RangeBuilder(androidx.app.slice.builders.ListBuilder);
- method public androidx.app.slice.builders.ListBuilder.RangeBuilder setMax(int);
- method public androidx.app.slice.builders.ListBuilder.RangeBuilder setTitle(java.lang.CharSequence);
- method public androidx.app.slice.builders.ListBuilder.RangeBuilder setValue(int);
+ public static class ListBuilder.RangeBuilder extends androidx.slice.builders.TemplateSliceBuilder {
+ ctor public ListBuilder.RangeBuilder(androidx.slice.builders.ListBuilder);
+ method public androidx.slice.builders.ListBuilder.RangeBuilder setMax(int);
+ method public androidx.slice.builders.ListBuilder.RangeBuilder setTitle(java.lang.CharSequence);
+ method public androidx.slice.builders.ListBuilder.RangeBuilder setValue(int);
}
- public static class ListBuilder.RowBuilder extends androidx.app.slice.builders.TemplateSliceBuilder {
- ctor public ListBuilder.RowBuilder(androidx.app.slice.builders.ListBuilder);
- ctor public ListBuilder.RowBuilder(androidx.app.slice.builders.ListBuilder, android.net.Uri);
+ public static class ListBuilder.RowBuilder extends androidx.slice.builders.TemplateSliceBuilder {
+ ctor public ListBuilder.RowBuilder(androidx.slice.builders.ListBuilder);
+ ctor public ListBuilder.RowBuilder(androidx.slice.builders.ListBuilder, android.net.Uri);
ctor public ListBuilder.RowBuilder(android.content.Context, android.net.Uri);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder addEndItem(long);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder addEndItem(android.graphics.drawable.Icon);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder addEndItem(android.graphics.drawable.Icon, boolean);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.app.slice.builders.SliceAction);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.app.slice.builders.SliceAction, boolean);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setPrimaryAction(androidx.app.slice.builders.SliceAction);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setSubtitle(java.lang.CharSequence);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setSubtitle(java.lang.CharSequence, boolean);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitle(java.lang.CharSequence);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitle(java.lang.CharSequence, boolean);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitleItem(long);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitleItem(android.graphics.drawable.Icon);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitleItem(android.graphics.drawable.Icon, boolean);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.app.slice.builders.SliceAction);
- method public androidx.app.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.app.slice.builders.SliceAction, boolean);
+ method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(long);
+ method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(android.graphics.drawable.Icon);
+ method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(android.graphics.drawable.Icon, boolean);
+ method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.slice.builders.SliceAction);
+ method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.slice.builders.SliceAction, boolean);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setSubtitle(java.lang.CharSequence);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setSubtitle(java.lang.CharSequence, boolean);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitle(java.lang.CharSequence);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitle(java.lang.CharSequence, boolean);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(long);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(android.graphics.drawable.Icon);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(android.graphics.drawable.Icon, boolean);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.slice.builders.SliceAction);
+ method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.slice.builders.SliceAction, boolean);
}
public class SliceAction {
@@ -103,13 +103,13 @@
method public java.lang.CharSequence getTitle();
method public boolean isChecked();
method public boolean isToggle();
- method public androidx.app.slice.builders.SliceAction setChecked(boolean);
- method public androidx.app.slice.builders.SliceAction setContentDescription(java.lang.CharSequence);
- method public androidx.app.slice.builders.SliceAction setPriority(int);
+ method public androidx.slice.builders.SliceAction setChecked(boolean);
+ method public androidx.slice.builders.SliceAction setContentDescription(java.lang.CharSequence);
+ method public androidx.slice.builders.SliceAction setPriority(int);
}
public abstract class TemplateSliceBuilder {
- method public androidx.app.slice.Slice build();
+ method public androidx.slice.Slice build();
}
}
diff --git a/slices/builders/src/main/AndroidManifest.xml b/slices/builders/src/main/AndroidManifest.xml
index 6f19650..6eababe 100644
--- a/slices/builders/src/main/AndroidManifest.xml
+++ b/slices/builders/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.app.slice.builders"/>
+<manifest package="androidx.slice.builders"/>
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/GridBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java
similarity index 96%
rename from slices/builders/src/main/java/androidx/app/slice/builders/GridBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java
index 8d34f57..bfa6a65 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/GridBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/GridBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders;
+package androidx.slice.builders;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -30,7 +30,7 @@
import java.util.function.Consumer;
-import androidx.app.slice.builders.impl.TemplateBuilderImpl;
+import androidx.slice.builders.impl.TemplateBuilderImpl;
/**
@@ -42,7 +42,7 @@
*/
public class GridBuilder extends TemplateSliceBuilder {
- private androidx.app.slice.builders.impl.GridBuilder mImpl;
+ private androidx.slice.builders.impl.GridBuilder mImpl;
private boolean mHasSeeMore;
/**
@@ -77,7 +77,7 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.GridBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.GridBuilder) impl;
}
/**
@@ -182,7 +182,7 @@
* @hide
*/
@RestrictTo(LIBRARY)
- public androidx.app.slice.builders.impl.GridBuilder getImpl() {
+ public androidx.slice.builders.impl.GridBuilder getImpl() {
return mImpl;
}
@@ -204,7 +204,7 @@
* </p>
*/
public static final class CellBuilder extends TemplateSliceBuilder {
- private androidx.app.slice.builders.impl.GridBuilder.CellBuilder mImpl;
+ private androidx.slice.builders.impl.GridBuilder.CellBuilder mImpl;
/**
* Create a builder which will construct a slice displayed as a cell in a grid.
@@ -224,7 +224,7 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.GridBuilder.CellBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.GridBuilder.CellBuilder) impl;
}
/**
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
similarity index 95%
rename from slices/builders/src/main/java/androidx/app/slice/builders/ListBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
index fd7ac96..786a69e 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders;
+package androidx.slice.builders;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
@@ -32,10 +32,10 @@
import java.util.function.Consumer;
-import androidx.app.slice.SliceSpecs;
-import androidx.app.slice.builders.impl.ListBuilderBasicImpl;
-import androidx.app.slice.builders.impl.ListBuilderV1Impl;
-import androidx.app.slice.builders.impl.TemplateBuilderImpl;
+import androidx.slice.SliceSpecs;
+import androidx.slice.builders.impl.ListBuilderBasicImpl;
+import androidx.slice.builders.impl.ListBuilderV1Impl;
+import androidx.slice.builders.impl.TemplateBuilderImpl;
/**
* Builder to construct slice content in a list format.
@@ -59,7 +59,7 @@
public class ListBuilder extends TemplateSliceBuilder {
private boolean mHasSeeMore;
- private androidx.app.slice.builders.impl.ListBuilder mImpl;
+ private androidx.slice.builders.impl.ListBuilder mImpl;
/**
* Create a builder which will construct a slice that will display rows of content.
@@ -71,7 +71,7 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.ListBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.ListBuilder) impl;
}
/**
@@ -252,7 +252,7 @@
* @hide
*/
@RestrictTo(LIBRARY)
- public androidx.app.slice.builders.impl.ListBuilder getImpl() {
+ public androidx.slice.builders.impl.ListBuilder getImpl() {
return mImpl;
}
@@ -298,7 +298,7 @@
* Builder to construct a range row.
*/
public static class RangeBuilder extends TemplateSliceBuilder {
- private androidx.app.slice.builders.impl.ListBuilder.RangeBuilder mImpl;
+ private androidx.slice.builders.impl.ListBuilder.RangeBuilder mImpl;
public RangeBuilder(@NonNull ListBuilder parent) {
super(parent.mImpl.createRangeBuilder());
@@ -333,7 +333,7 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.ListBuilder.RangeBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.ListBuilder.RangeBuilder) impl;
}
}
@@ -341,7 +341,7 @@
* Builder to construct a input range row.
*/
public static class InputRangeBuilder extends TemplateSliceBuilder {
- private androidx.app.slice.builders.impl.ListBuilder.InputRangeBuilder mImpl;
+ private androidx.slice.builders.impl.ListBuilder.InputRangeBuilder mImpl;
public InputRangeBuilder(@NonNull ListBuilder parent) {
super(parent.mImpl.createInputRangeBuilder());
@@ -395,7 +395,7 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.ListBuilder.InputRangeBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.ListBuilder.InputRangeBuilder) impl;
}
}
@@ -421,7 +421,7 @@
*/
public static class RowBuilder extends TemplateSliceBuilder {
- private androidx.app.slice.builders.impl.ListBuilder.RowBuilder mImpl;
+ private androidx.slice.builders.impl.ListBuilder.RowBuilder mImpl;
private boolean mHasEndActionOrToggle;
private boolean mHasEndImage;
@@ -666,14 +666,14 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.ListBuilder.RowBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.ListBuilder.RowBuilder) impl;
}
/**
* @hide
*/
@RestrictTo(LIBRARY)
- public androidx.app.slice.builders.impl.ListBuilder.RowBuilder getImpl() {
+ public androidx.slice.builders.impl.ListBuilder.RowBuilder getImpl() {
return mImpl;
}
@@ -686,7 +686,7 @@
* @see ListBuilder#setHeader(HeaderBuilder)
*/
public static class HeaderBuilder extends TemplateSliceBuilder {
- private androidx.app.slice.builders.impl.ListBuilder.HeaderBuilder mImpl;
+ private androidx.slice.builders.impl.ListBuilder.HeaderBuilder mImpl;
/**
* Create builder for header templates.
@@ -744,7 +744,7 @@
@Override
void setImpl(TemplateBuilderImpl impl) {
- mImpl = (androidx.app.slice.builders.impl.ListBuilder.HeaderBuilder) impl;
+ mImpl = (androidx.slice.builders.impl.ListBuilder.HeaderBuilder) impl;
}
}
}
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/MessagingSliceBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
similarity index 91%
rename from slices/builders/src/main/java/androidx/app/slice/builders/MessagingSliceBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
index e51fd0b..278d773 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/MessagingSliceBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders;
+package androidx.slice.builders;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
@@ -29,12 +29,12 @@
import java.util.function.Consumer;
-import androidx.app.slice.SliceSpecs;
-import androidx.app.slice.builders.impl.MessagingBasicImpl;
-import androidx.app.slice.builders.impl.MessagingBuilder;
-import androidx.app.slice.builders.impl.MessagingListV1Impl;
-import androidx.app.slice.builders.impl.MessagingV1Impl;
-import androidx.app.slice.builders.impl.TemplateBuilderImpl;
+import androidx.slice.SliceSpecs;
+import androidx.slice.builders.impl.MessagingBasicImpl;
+import androidx.slice.builders.impl.MessagingBuilder;
+import androidx.slice.builders.impl.MessagingListV1Impl;
+import androidx.slice.builders.impl.MessagingV1Impl;
+import androidx.slice.builders.impl.TemplateBuilderImpl;
/**
* Builder to construct slice content in a messaging format.
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/SliceAction.java b/slices/builders/src/main/java/androidx/slice/builders/SliceAction.java
similarity index 98%
rename from slices/builders/src/main/java/androidx/app/slice/builders/SliceAction.java
rename to slices/builders/src/main/java/androidx/slice/builders/SliceAction.java
index 57d289b..db68c09 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/SliceAction.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/SliceAction.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders;
+package androidx.slice.builders;
import static android.app.slice.Slice.HINT_SELECTED;
import static android.app.slice.Slice.HINT_SHORTCUT;
@@ -31,7 +31,7 @@
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
+import androidx.slice.Slice;
/**
* Class representing an action, supports tappable icons, custom toggle icons, and default toggles.
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/TemplateSliceBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
similarity index 93%
rename from slices/builders/src/main/java/androidx/app/slice/builders/TemplateSliceBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
index f0a495c..88de3e9 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/TemplateSliceBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders;
+package androidx.slice.builders;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -27,11 +27,11 @@
import java.util.Arrays;
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceProvider;
-import androidx.app.slice.SliceSpec;
-import androidx.app.slice.SliceSpecs;
-import androidx.app.slice.builders.impl.TemplateBuilderImpl;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.SliceSpec;
+import androidx.slice.SliceSpecs;
+import androidx.slice.builders.impl.TemplateBuilderImpl;
/**
* Base class of builders of various template types.
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java
similarity index 98%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java
index dfca415..9768b07 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -25,7 +25,7 @@
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.builders.SliceAction;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilderBasicImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java
similarity index 96%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilderBasicImpl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java
index 1b49050..3b2d94f 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilderBasicImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderBasicImpl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -25,8 +25,8 @@
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.Slice;
+import androidx.slice.builders.SliceAction;
/**
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilderListV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java
similarity index 95%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilderListV1Impl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java
index e116e08..e4c3dce 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/GridBuilderListV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/GridBuilderListV1Impl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.app.slice.Slice.HINT_HORIZONTAL;
import static android.app.slice.Slice.HINT_LARGE;
@@ -26,8 +26,8 @@
import static android.app.slice.Slice.HINT_TITLE;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
-import static androidx.app.slice.builders.GridBuilder.ICON_IMAGE;
-import static androidx.app.slice.builders.GridBuilder.LARGE_IMAGE;
+import static androidx.slice.builders.GridBuilder.ICON_IMAGE;
+import static androidx.slice.builders.GridBuilder.LARGE_IMAGE;
import android.app.PendingIntent;
import android.graphics.drawable.Icon;
@@ -38,8 +38,8 @@
import java.util.ArrayList;
-import androidx.app.slice.Slice;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.Slice;
+import androidx.slice.builders.SliceAction;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
similarity index 98%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
index c16da2b..032e0ce 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -25,7 +25,7 @@
import android.support.annotation.NonNull;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.builders.SliceAction;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilderBasicImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
similarity index 97%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilderBasicImpl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
index b47e7f2..8ef53e7 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilderBasicImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -25,9 +25,9 @@
import android.support.annotation.NonNull;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceSpec;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.Slice;
+import androidx.slice.SliceSpec;
+import androidx.slice.builders.SliceAction;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilderV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
similarity index 97%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilderV1Impl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
index 0a73f34..4147dc4 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/ListBuilderV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderV1Impl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.app.slice.Slice.HINT_ACTIONS;
import static android.app.slice.Slice.HINT_LARGE;
@@ -29,9 +29,9 @@
import static android.app.slice.SliceItem.FORMAT_TEXT;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
-import static androidx.app.slice.core.SliceHints.SUBTYPE_MAX;
-import static androidx.app.slice.core.SliceHints.SUBTYPE_RANGE;
-import static androidx.app.slice.core.SliceHints.SUBTYPE_VALUE;
+import static androidx.slice.core.SliceHints.SUBTYPE_MAX;
+import static androidx.slice.core.SliceHints.SUBTYPE_RANGE;
+import static androidx.slice.core.SliceHints.SUBTYPE_VALUE;
import android.app.PendingIntent;
import android.graphics.drawable.Icon;
@@ -44,10 +44,10 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.SliceSpec;
-import androidx.app.slice.builders.SliceAction;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceSpec;
+import androidx.slice.builders.SliceAction;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingBasicImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
similarity index 95%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingBasicImpl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
index 843302c..0534ada 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingBasicImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
import android.graphics.drawable.Icon;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceSpec;
+import androidx.slice.Slice;
+import androidx.slice.SliceSpec;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
similarity index 97%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingBuilder.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
index 635f160..78da3eb 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingListV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
similarity index 95%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingListV1Impl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
index 408ad0b..46481bf 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingListV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
import android.graphics.drawable.Icon;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceSpec;
+import androidx.slice.Slice;
+import androidx.slice.SliceSpec;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingV1Impl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
similarity index 95%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingV1Impl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
index 4e07139..d8b634f 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/MessagingV1Impl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.app.slice.Slice.SUBTYPE_MESSAGE;
import android.graphics.drawable.Icon;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceSpec;
+import androidx.slice.Slice;
+import androidx.slice.SliceSpec;
/**
* @hide
diff --git a/slices/builders/src/main/java/androidx/app/slice/builders/impl/TemplateBuilderImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
similarity index 93%
rename from slices/builders/src/main/java/androidx/app/slice/builders/impl/TemplateBuilderImpl.java
rename to slices/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
index 294677e..068e69d 100644
--- a/slices/builders/src/main/java/androidx/app/slice/builders/impl/TemplateBuilderImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.app.slice.builders.impl;
+package androidx.slice.builders.impl;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceSpec;
+import androidx.slice.Slice;
+import androidx.slice.SliceSpec;
/**
* @hide
diff --git a/slices/core/api/current.txt b/slices/core/api/current.txt
index 77936d6..c1668ab 100644
--- a/slices/core/api/current.txt
+++ b/slices/core/api/current.txt
@@ -1,15 +1,15 @@
-package androidx.app.slice {
+package androidx.slice {
public final class Slice {
method public java.util.List<java.lang.String> getHints();
- method public java.util.List<androidx.app.slice.SliceItem> getItems();
+ method public java.util.List<androidx.slice.SliceItem> getItems();
method public android.net.Uri getUri();
}
public class SliceConvert {
ctor public SliceConvert();
- method public static android.app.slice.Slice unwrap(androidx.app.slice.Slice);
- method public static androidx.app.slice.Slice wrap(android.app.slice.Slice);
+ method public static android.app.slice.Slice unwrap(androidx.slice.Slice);
+ method public static androidx.slice.Slice wrap(android.app.slice.Slice);
}
public class SliceItem {
@@ -18,7 +18,7 @@
method public java.util.List<java.lang.String> getHints();
method public android.graphics.drawable.Icon getIcon();
method public int getInt();
- method public androidx.app.slice.Slice getSlice();
+ method public androidx.slice.Slice getSlice();
method public java.lang.String getSubType();
method public java.lang.CharSequence getText();
method public long getTimestamp();
@@ -27,7 +27,7 @@
public abstract class SliceProvider extends android.content.ContentProvider {
ctor public SliceProvider();
- method public abstract androidx.app.slice.Slice onBindSlice(android.net.Uri);
+ method public abstract androidx.slice.Slice onBindSlice(android.net.Uri);
method public abstract boolean onCreateSliceProvider();
method public android.net.Uri onMapIntentToUri(android.content.Intent);
method public void onSlicePinned(android.net.Uri);
diff --git a/slices/core/src/androidTest/AndroidManifest.xml b/slices/core/src/androidTest/AndroidManifest.xml
index 90dbbcc..6ee1fbd 100644
--- a/slices/core/src/androidTest/AndroidManifest.xml
+++ b/slices/core/src/androidTest/AndroidManifest.xml
@@ -16,12 +16,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.app.slice.core.test">
+ package="androidx.slice.core.test">
<uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<application>
- <provider android:name="androidx.app.slice.SliceTestProvider"
- android:authorities="androidx.app.slice.core.test"
+ <provider android:name="androidx.slice.SliceTestProvider"
+ android:authorities="androidx.slice.core.test"
android:process=":provider"
android:exported="true" />
</application>
diff --git a/slices/core/src/androidTest/java/androidx/app/slice/SliceTest.java b/slices/core/src/androidTest/java/androidx/slice/SliceTest.java
similarity index 98%
rename from slices/core/src/androidTest/java/androidx/app/slice/SliceTest.java
rename to slices/core/src/androidTest/java/androidx/slice/SliceTest.java
index 0ede29d..ef3b000 100644
--- a/slices/core/src/androidTest/java/androidx/app/slice/SliceTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/SliceTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.Slice.HINT_LARGE;
import static android.app.slice.Slice.HINT_LIST;
@@ -52,7 +52,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import androidx.app.slice.core.test.R;
+import androidx.slice.core.test.R;
@RunWith(AndroidJUnit4.class)
@SmallTest
@@ -60,7 +60,7 @@
public static boolean sFlag = false;
- private static final Uri BASE_URI = Uri.parse("content://androidx.app.slice.core.test/");
+ private static final Uri BASE_URI = Uri.parse("content://androidx.slice.core.test/");
private final Context mContext = InstrumentationRegistry.getContext();
@Test
diff --git a/slices/core/src/androidTest/java/androidx/app/slice/SliceTestProvider.java b/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
similarity index 93%
rename from slices/core/src/androidTest/java/androidx/app/slice/SliceTestProvider.java
rename to slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
index 9320bc9..ab68646 100644
--- a/slices/core/src/androidTest/java/androidx/app/slice/SliceTestProvider.java
+++ b/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.Slice.HINT_LARGE;
import static android.app.slice.Slice.HINT_LIST;
@@ -26,10 +26,10 @@
import android.graphics.drawable.Icon;
import android.net.Uri;
-import androidx.app.slice.Slice.Builder;
-import androidx.app.slice.core.test.R;
+import androidx.slice.Slice.Builder;
+import androidx.slice.core.test.R;
-public class SliceTestProvider extends androidx.app.slice.SliceProvider {
+public class SliceTestProvider extends androidx.slice.SliceProvider {
@Override
public boolean onCreateSliceProvider() {
diff --git a/slices/core/src/androidTest/java/androidx/app/slice/compat/CompatPinnedListTest.java b/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
similarity index 98%
rename from slices/core/src/androidTest/java/androidx/app/slice/compat/CompatPinnedListTest.java
rename to slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
index 18bb606..939309d 100644
--- a/slices/core/src/androidTest/java/androidx/app/slice/compat/CompatPinnedListTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.compat;
+package androidx.slice.compat;
import static android.content.Context.MODE_PRIVATE;
@@ -39,7 +39,7 @@
import java.util.Collections;
import java.util.List;
-import androidx.app.slice.SliceSpec;
+import androidx.slice.SliceSpec;
@RunWith(AndroidJUnit4.class)
@SmallTest
diff --git a/slices/core/src/main/AndroidManifest.xml b/slices/core/src/main/AndroidManifest.xml
index 38f75d2..62b06f4 100644
--- a/slices/core/src/main/AndroidManifest.xml
+++ b/slices/core/src/main/AndroidManifest.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.app.slice.core">
+ package="androidx.slice.core">
<application>
- <activity android:name="androidx.app.slice.compat.SlicePermissionActivity">
+ <activity android:name="androidx.slice.compat.SlicePermissionActivity">
</activity>
</application>
</manifest>
diff --git a/slices/core/src/main/java/androidx/app/slice/ArrayUtils.java b/slices/core/src/main/java/androidx/slice/ArrayUtils.java
similarity index 98%
rename from slices/core/src/main/java/androidx/app/slice/ArrayUtils.java
rename to slices/core/src/main/java/androidx/slice/ArrayUtils.java
index 669f66a..e807114 100644
--- a/slices/core/src/main/java/androidx/app/slice/ArrayUtils.java
+++ b/slices/core/src/main/java/androidx/slice/ArrayUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import android.support.annotation.RestrictTo;
diff --git a/slices/core/src/main/java/androidx/app/slice/Slice.java b/slices/core/src/main/java/androidx/slice/Slice.java
similarity index 97%
rename from slices/core/src/main/java/androidx/app/slice/Slice.java
rename to slices/core/src/main/java/androidx/slice/Slice.java
index 966c877..56a9af8 100644
--- a/slices/core/src/main/java/androidx/app/slice/Slice.java
+++ b/slices/core/src/main/java/androidx/slice/Slice.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.Slice.HINT_ACTIONS;
import static android.app.slice.Slice.HINT_HORIZONTAL;
@@ -36,7 +36,7 @@
import static android.app.slice.SliceItem.FORMAT_TEXT;
import static android.app.slice.SliceItem.FORMAT_TIMESTAMP;
-import static androidx.app.slice.SliceConvert.unwrap;
+import static androidx.slice.SliceConvert.unwrap;
import android.annotation.TargetApi;
import android.app.PendingIntent;
@@ -58,12 +58,12 @@
import java.util.Arrays;
import java.util.List;
-import androidx.app.slice.compat.SliceProviderCompat;
+import androidx.slice.compat.SliceProviderCompat;
/**
* A slice is a piece of app content and actions that can be surfaced outside of the app.
*
- * <p>They are constructed using {@link androidx.app.slice.builders.TemplateSliceBuilder}s
+ * <p>They are constructed using {@link androidx.slice.builders.TemplateSliceBuilder}s
* in a tree structure that provides the OS some information about how the content should be
* displayed.
*/
@@ -438,8 +438,9 @@
*/
@RestrictTo(Scope.LIBRARY_GROUP)
@SuppressWarnings("NewApi")
- public static @Nullable Slice bindSlice(Context context, @NonNull Uri uri,
- List<SliceSpec> supportedSpecs) {
+ @Nullable
+ public static Slice bindSlice(Context context, @NonNull Uri uri,
+ List<SliceSpec> supportedSpecs) {
if (BuildCompat.isAtLeastP()) {
return callBindSlice(context, uri, supportedSpecs);
} else {
diff --git a/slices/core/src/main/java/androidx/app/slice/SliceConvert.java b/slices/core/src/main/java/androidx/slice/SliceConvert.java
similarity index 81%
rename from slices/core/src/main/java/androidx/app/slice/SliceConvert.java
rename to slices/core/src/main/java/androidx/slice/SliceConvert.java
index 0bacae7..e19a7d0 100644
--- a/slices/core/src/main/java/androidx/app/slice/SliceConvert.java
+++ b/slices/core/src/main/java/androidx/slice/SliceConvert.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.SliceItem.FORMAT_ACTION;
@@ -31,20 +31,20 @@
import java.util.List;
/**
- * Convert between {@link androidx.app.slice.Slice} and {@link android.app.slice.Slice}
+ * Convert between {@link androidx.slice.Slice} and {@link android.app.slice.Slice}
*/
@RequiresApi(28)
public class SliceConvert {
/**
- * Convert {@link androidx.app.slice.Slice} to {@link android.app.slice.Slice}
+ * Convert {@link androidx.slice.Slice} to {@link android.app.slice.Slice}
*/
- public static android.app.slice.Slice unwrap(androidx.app.slice.Slice slice) {
+ public static android.app.slice.Slice unwrap(androidx.slice.Slice slice) {
android.app.slice.Slice.Builder builder = new android.app.slice.Slice.Builder(
slice.getUri());
builder.addHints(slice.getHints());
builder.setSpec(unwrap(slice.getSpec()));
- for (androidx.app.slice.SliceItem item : slice.getItems()) {
+ for (androidx.slice.SliceItem item : slice.getItems()) {
switch (item.getFormat()) {
case FORMAT_SLICE:
builder.addSubSlice(unwrap(item.getSlice()), item.getSubType());
@@ -73,25 +73,25 @@
return builder.build();
}
- private static android.app.slice.SliceSpec unwrap(androidx.app.slice.SliceSpec spec) {
+ private static android.app.slice.SliceSpec unwrap(androidx.slice.SliceSpec spec) {
if (spec == null) return null;
return new android.app.slice.SliceSpec(spec.getType(), spec.getRevision());
}
static List<android.app.slice.SliceSpec> unwrap(
- List<androidx.app.slice.SliceSpec> supportedSpecs) {
+ List<androidx.slice.SliceSpec> supportedSpecs) {
List<android.app.slice.SliceSpec> ret = new ArrayList<>();
- for (androidx.app.slice.SliceSpec spec : supportedSpecs) {
+ for (androidx.slice.SliceSpec spec : supportedSpecs) {
ret.add(unwrap(spec));
}
return ret;
}
/**
- * Convert {@link android.app.slice.Slice} to {@link androidx.app.slice.Slice}
+ * Convert {@link android.app.slice.Slice} to {@link androidx.slice.Slice}
*/
- public static androidx.app.slice.Slice wrap(android.app.slice.Slice slice) {
- androidx.app.slice.Slice.Builder builder = new androidx.app.slice.Slice.Builder(
+ public static androidx.slice.Slice wrap(android.app.slice.Slice slice) {
+ androidx.slice.Slice.Builder builder = new androidx.slice.Slice.Builder(
slice.getUri());
builder.addHints(slice.getHints());
builder.setSpec(wrap(slice.getSpec()));
@@ -124,18 +124,18 @@
return builder.build();
}
- private static androidx.app.slice.SliceSpec wrap(android.app.slice.SliceSpec spec) {
+ private static androidx.slice.SliceSpec wrap(android.app.slice.SliceSpec spec) {
if (spec == null) return null;
- return new androidx.app.slice.SliceSpec(spec.getType(), spec.getRevision());
+ return new androidx.slice.SliceSpec(spec.getType(), spec.getRevision());
}
/**
* @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY)
- public static List<androidx.app.slice.SliceSpec> wrap(
+ public static List<androidx.slice.SliceSpec> wrap(
List<android.app.slice.SliceSpec> supportedSpecs) {
- List<androidx.app.slice.SliceSpec> ret = new ArrayList<>();
+ List<androidx.slice.SliceSpec> ret = new ArrayList<>();
for (android.app.slice.SliceSpec spec : supportedSpecs) {
ret.add(wrap(spec));
}
diff --git a/slices/core/src/main/java/androidx/app/slice/SliceItem.java b/slices/core/src/main/java/androidx/slice/SliceItem.java
similarity index 99%
rename from slices/core/src/main/java/androidx/app/slice/SliceItem.java
rename to slices/core/src/main/java/androidx/slice/SliceItem.java
index e7d2729..07cc575 100644
--- a/slices/core/src/main/java/androidx/app/slice/SliceItem.java
+++ b/slices/core/src/main/java/androidx/slice/SliceItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.SliceItem.FORMAT_ACTION;
import static android.app.slice.SliceItem.FORMAT_IMAGE;
diff --git a/slices/core/src/main/java/androidx/app/slice/SliceProvider.java b/slices/core/src/main/java/androidx/slice/SliceProvider.java
similarity index 96%
rename from slices/core/src/main/java/androidx/app/slice/SliceProvider.java
rename to slices/core/src/main/java/androidx/slice/SliceProvider.java
index 80b9879..fb62de8 100644
--- a/slices/core/src/main/java/androidx/app/slice/SliceProvider.java
+++ b/slices/core/src/main/java/androidx/slice/SliceProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import android.content.ContentProvider;
import android.content.ContentResolver;
@@ -29,9 +29,9 @@
import java.util.List;
-import androidx.app.slice.compat.ContentProviderWrapper;
-import androidx.app.slice.compat.SliceProviderCompat;
-import androidx.app.slice.compat.SliceProviderWrapperContainer;
+import androidx.slice.compat.ContentProviderWrapper;
+import androidx.slice.compat.SliceProviderCompat;
+import androidx.slice.compat.SliceProviderWrapperContainer;
/**
* A SliceProvider allows an app to provide content to be displayed in system spaces. This content
diff --git a/slices/core/src/main/java/androidx/app/slice/SliceSpec.java b/slices/core/src/main/java/androidx/slice/SliceSpec.java
similarity index 97%
rename from slices/core/src/main/java/androidx/app/slice/SliceSpec.java
rename to slices/core/src/main/java/androidx/slice/SliceSpec.java
index 0d7a157..56ff039 100644
--- a/slices/core/src/main/java/androidx/app/slice/SliceSpec.java
+++ b/slices/core/src/main/java/androidx/slice/SliceSpec.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import android.net.Uri;
import android.support.annotation.NonNull;
@@ -71,7 +71,7 @@
*
* @param candidate candidate format of data.
* @return true if versions are compatible.
- * @see androidx.app.slice.widget.SliceView
+ * @see androidx.slice.widget.SliceView
*/
public boolean canRender(@NonNull SliceSpec candidate) {
if (!mType.equals(candidate.mType)) return false;
diff --git a/slices/core/src/main/java/androidx/app/slice/SliceSpecs.java b/slices/core/src/main/java/androidx/slice/SliceSpecs.java
similarity index 92%
rename from slices/core/src/main/java/androidx/app/slice/SliceSpecs.java
rename to slices/core/src/main/java/androidx/slice/SliceSpecs.java
index 6629f21..f46567a 100644
--- a/slices/core/src/main/java/androidx/app/slice/SliceSpecs.java
+++ b/slices/core/src/main/java/androidx/slice/SliceSpecs.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import android.support.annotation.RestrictTo;
@@ -28,17 +28,17 @@
/**
* Most basic slice, only has icon, title, and summary.
*/
- public static final SliceSpec BASIC = new SliceSpec("androidx.app.slice.BASIC", 1);
+ public static final SliceSpec BASIC = new SliceSpec("androidx.slice.BASIC", 1);
/**
* List of rows, each row has start/end items, title, summary.
* Also supports grid rows.
*/
- public static final SliceSpec LIST = new SliceSpec("androidx.app.slice.LIST", 1);
+ public static final SliceSpec LIST = new SliceSpec("androidx.slice.LIST", 1);
/**
* Messaging template. Each message contains a timestamp and a message, it optionally contains
* a source of where the message came from.
*/
- public static final SliceSpec MESSAGING = new SliceSpec("androidx.app.slice.MESSAGING", 1);
+ public static final SliceSpec MESSAGING = new SliceSpec("androidx.slice.MESSAGING", 1);
}
diff --git a/slices/core/src/main/java/androidx/app/slice/compat/CompatPinnedList.java b/slices/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
similarity index 98%
rename from slices/core/src/main/java/androidx/app/slice/compat/CompatPinnedList.java
rename to slices/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
index 7a3b900..a6d74c6 100644
--- a/slices/core/src/main/java/androidx/app/slice/compat/CompatPinnedList.java
+++ b/slices/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.compat;
+package androidx.slice.compat;
import android.content.Context;
import android.content.SharedPreferences;
@@ -31,7 +31,7 @@
import java.util.Objects;
import java.util.Set;
-import androidx.app.slice.SliceSpec;
+import androidx.slice.SliceSpec;
/**
* Tracks the current packages requesting pinning of any given slice. It will clear the
diff --git a/slices/core/src/main/java/androidx/app/slice/compat/ContentProviderWrapper.java b/slices/core/src/main/java/androidx/slice/compat/ContentProviderWrapper.java
similarity index 98%
rename from slices/core/src/main/java/androidx/app/slice/compat/ContentProviderWrapper.java
rename to slices/core/src/main/java/androidx/slice/compat/ContentProviderWrapper.java
index 9e02b3a..30971ad 100644
--- a/slices/core/src/main/java/androidx/app/slice/compat/ContentProviderWrapper.java
+++ b/slices/core/src/main/java/androidx/slice/compat/ContentProviderWrapper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.app.slice.compat;
+package androidx.slice.compat;
import android.content.ContentProvider;
import android.content.ContentValues;
diff --git a/slices/core/src/main/java/androidx/app/slice/compat/SlicePermissionActivity.java b/slices/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
similarity index 97%
rename from slices/core/src/main/java/androidx/app/slice/compat/SlicePermissionActivity.java
rename to slices/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
index 78170ab..29f0c8b 100644
--- a/slices/core/src/main/java/androidx/app/slice/compat/SlicePermissionActivity.java
+++ b/slices/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.compat;
+package androidx.slice.compat;
import android.app.Activity;
import android.app.AlertDialog;
@@ -30,7 +30,7 @@
import android.util.Log;
import android.widget.TextView;
-import androidx.app.slice.core.R;
+import androidx.slice.core.R;
/**
* Dialog that grants slice permissions for an app.
diff --git a/slices/core/src/main/java/androidx/app/slice/compat/SliceProviderCompat.java b/slices/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
similarity index 98%
rename from slices/core/src/main/java/androidx/app/slice/compat/SliceProviderCompat.java
rename to slices/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
index be3b88b..d05a40c 100644
--- a/slices/core/src/main/java/androidx/app/slice/compat/SliceProviderCompat.java
+++ b/slices/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.app.slice.compat;
+package androidx.slice.compat;
import static android.app.slice.Slice.HINT_LIST_ITEM;
import static android.app.slice.SliceProvider.SLICE_TYPE;
@@ -50,11 +50,11 @@
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceProvider;
-import androidx.app.slice.SliceSpec;
-import androidx.app.slice.core.R;
-import androidx.app.slice.core.SliceHints;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.SliceSpec;
+import androidx.slice.core.R;
+import androidx.slice.core.SliceHints;
/**
* @hide
@@ -309,7 +309,7 @@
String callingPackage) {
Intent intent = new Intent();
intent.setComponent(new ComponentName(context.getPackageName(),
- "androidx.app.slice.compat.SlicePermissionActivity"));
+ "androidx.slice.compat.SlicePermissionActivity"));
intent.putExtra(EXTRA_BIND_URI, sliceUri);
intent.putExtra(EXTRA_PKG, callingPackage);
intent.putExtra(EXTRA_PROVIDER_PKG, context.getPackageName());
diff --git a/slices/core/src/main/java/androidx/app/slice/compat/SliceProviderWrapperContainer.java b/slices/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
similarity index 82%
rename from slices/core/src/main/java/androidx/app/slice/compat/SliceProviderWrapperContainer.java
rename to slices/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
index ebc2ad1..9aab283 100644
--- a/slices/core/src/main/java/androidx/app/slice/compat/SliceProviderWrapperContainer.java
+++ b/slices/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.app.slice.compat;
+package androidx.slice.compat;
-import static androidx.app.slice.SliceConvert.wrap;
+import static androidx.slice.SliceConvert.wrap;
import android.annotation.TargetApi;
import android.app.slice.Slice;
@@ -29,7 +29,7 @@
import java.util.List;
-import androidx.app.slice.SliceConvert;
+import androidx.slice.SliceConvert;
/**
* @hide
@@ -42,9 +42,9 @@
*/
public static class SliceProviderWrapper extends SliceProvider {
- private androidx.app.slice.SliceProvider mSliceProvider;
+ private androidx.slice.SliceProvider mSliceProvider;
- public SliceProviderWrapper(androidx.app.slice.SliceProvider provider) {
+ public SliceProviderWrapper(androidx.slice.SliceProvider provider) {
mSliceProvider = provider;
}
@@ -55,11 +55,11 @@
@Override
public Slice onBindSlice(Uri sliceUri, List<SliceSpec> supportedVersions) {
- androidx.app.slice.SliceProvider.setSpecs(wrap(supportedVersions));
+ androidx.slice.SliceProvider.setSpecs(wrap(supportedVersions));
try {
return SliceConvert.unwrap(mSliceProvider.onBindSlice(sliceUri));
} finally {
- androidx.app.slice.SliceProvider.setSpecs(null);
+ androidx.slice.SliceProvider.setSpecs(null);
}
}
diff --git a/slices/core/src/main/java/androidx/app/slice/core/SliceHints.java b/slices/core/src/main/java/androidx/slice/core/SliceHints.java
similarity index 98%
rename from slices/core/src/main/java/androidx/app/slice/core/SliceHints.java
rename to slices/core/src/main/java/androidx/slice/core/SliceHints.java
index 09f9540..b7b8610 100644
--- a/slices/core/src/main/java/androidx/app/slice/core/SliceHints.java
+++ b/slices/core/src/main/java/androidx/slice/core/SliceHints.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.core;
+package androidx.slice.core;
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
diff --git a/slices/core/src/main/java/androidx/app/slice/core/SliceQuery.java b/slices/core/src/main/java/androidx/slice/core/SliceQuery.java
similarity index 98%
rename from slices/core/src/main/java/androidx/app/slice/core/SliceQuery.java
rename to slices/core/src/main/java/androidx/slice/core/SliceQuery.java
index f0f2371..724f4c9 100644
--- a/slices/core/src/main/java/androidx/app/slice/core/SliceQuery.java
+++ b/slices/core/src/main/java/androidx/slice/core/SliceQuery.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.core;
+package androidx.slice.core;
import static android.app.slice.SliceItem.FORMAT_ACTION;
import static android.app.slice.SliceItem.FORMAT_SLICE;
@@ -33,8 +33,8 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
/**
* Utilities for finding content within a Slice.
diff --git a/slices/core/src/main/res-public/values-v28/strings.xml b/slices/core/src/main/res-public/values-v28/strings.xml
index cb2a320..36b4142 100644
--- a/slices/core/src/main/res-public/values-v28/strings.xml
+++ b/slices/core/src/main/res-public/values-v28/strings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="slice_provider">androidx.app.slice.compat.SliceProviderWrapperContainer.SliceProviderWrapper</string>
+ <string name="slice_provider">androidx.slice.compat.SliceProviderWrapperContainer.SliceProviderWrapper</string>
</resources>
\ No newline at end of file
diff --git a/slices/core/src/main/res-public/values/strings.xml b/slices/core/src/main/res-public/values/strings.xml
index d492a38..880b478 100644
--- a/slices/core/src/main/res-public/values/strings.xml
+++ b/slices/core/src/main/res-public/values/strings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="slice_provider">androidx.app.slice.compat.SliceProviderCompat</string>
+ <string name="slice_provider">androidx.slice.compat.SliceProviderCompat</string>
</resources>
diff --git a/slices/view/api/current.txt b/slices/view/api/current.txt
index f201238..af2a1be 100644
--- a/slices/view/api/current.txt
+++ b/slices/view/api/current.txt
@@ -1,26 +1,26 @@
-package androidx.app.slice {
+package androidx.slice {
public abstract class SliceManager {
- method public abstract androidx.app.slice.Slice bindSlice(android.net.Uri);
- method public abstract androidx.app.slice.Slice bindSlice(android.content.Intent);
- method public static androidx.app.slice.SliceManager getInstance(android.content.Context);
+ method public abstract androidx.slice.Slice bindSlice(android.net.Uri);
+ method public abstract androidx.slice.Slice bindSlice(android.content.Intent);
+ method public static androidx.slice.SliceManager getInstance(android.content.Context);
method public abstract android.net.Uri mapIntentToUri(android.content.Intent);
method public abstract void pinSlice(android.net.Uri);
- method public abstract void registerSliceCallback(android.net.Uri, androidx.app.slice.SliceManager.SliceCallback);
- method public abstract void registerSliceCallback(android.net.Uri, java.util.concurrent.Executor, androidx.app.slice.SliceManager.SliceCallback);
+ method public abstract void registerSliceCallback(android.net.Uri, androidx.slice.SliceManager.SliceCallback);
+ method public abstract void registerSliceCallback(android.net.Uri, java.util.concurrent.Executor, androidx.slice.SliceManager.SliceCallback);
method public abstract void unpinSlice(android.net.Uri);
- method public abstract void unregisterSliceCallback(android.net.Uri, androidx.app.slice.SliceManager.SliceCallback);
+ method public abstract void unregisterSliceCallback(android.net.Uri, androidx.slice.SliceManager.SliceCallback);
}
public static abstract interface SliceManager.SliceCallback {
- method public abstract void onSliceUpdated(androidx.app.slice.Slice);
+ method public abstract void onSliceUpdated(androidx.slice.Slice);
}
public class SliceUtils {
- method public static int getLoadingState(androidx.app.slice.Slice);
- method public static java.util.List<androidx.app.slice.SliceItem> getSliceActions(androidx.app.slice.Slice);
- method public static androidx.app.slice.Slice parseSlice(java.io.InputStream, java.lang.String) throws java.io.IOException;
- method public static void serializeSlice(androidx.app.slice.Slice, android.content.Context, java.io.OutputStream, java.lang.String, androidx.app.slice.SliceUtils.SerializeOptions) throws java.io.IOException;
+ method public static int getLoadingState(androidx.slice.Slice);
+ method public static java.util.List<androidx.slice.SliceItem> getSliceActions(androidx.slice.Slice);
+ method public static androidx.slice.Slice parseSlice(java.io.InputStream, java.lang.String) throws java.io.IOException;
+ method public static void serializeSlice(androidx.slice.Slice, android.content.Context, java.io.OutputStream, java.lang.String, androidx.slice.SliceUtils.SerializeOptions) throws java.io.IOException;
field public static final int LOADING_ALL = 0; // 0x0
field public static final int LOADING_COMPLETE = 2; // 0x2
field public static final int LOADING_PARTIAL = 1; // 0x1
@@ -28,8 +28,8 @@
public static class SliceUtils.SerializeOptions {
ctor public SliceUtils.SerializeOptions();
- method public androidx.app.slice.SliceUtils.SerializeOptions setActionMode(int);
- method public androidx.app.slice.SliceUtils.SerializeOptions setImageMode(int);
+ method public androidx.slice.SliceUtils.SerializeOptions setActionMode(int);
+ method public androidx.slice.SliceUtils.SerializeOptions setImageMode(int);
field public static final int MODE_DISABLE = 2; // 0x2
field public static final int MODE_REMOVE = 1; // 0x1
field public static final int MODE_THROW = 0; // 0x0
@@ -37,7 +37,7 @@
}
-package androidx.app.slice.widget {
+package androidx.slice.widget {
public class EventInfo {
ctor public EventInfo(int, int, int, int);
@@ -67,8 +67,8 @@
public final class SliceLiveData {
ctor public SliceLiveData();
- method public static android.arch.lifecycle.LiveData<androidx.app.slice.Slice> fromIntent(android.content.Context, android.content.Intent);
- method public static android.arch.lifecycle.LiveData<androidx.app.slice.Slice> fromUri(android.content.Context, android.net.Uri);
+ method public static android.arch.lifecycle.LiveData<androidx.slice.Slice> fromIntent(android.content.Context, android.content.Intent);
+ method public static android.arch.lifecycle.LiveData<androidx.slice.Slice> fromUri(android.content.Context, android.net.Uri);
}
public class SliceView extends android.view.ViewGroup implements android.arch.lifecycle.Observer {
@@ -77,13 +77,13 @@
ctor public SliceView(android.content.Context, android.util.AttributeSet, int);
ctor public SliceView(android.content.Context, android.util.AttributeSet, int, int);
method public int getMode();
- method public java.util.List<androidx.app.slice.SliceItem> getSliceActions();
- method public void onChanged(androidx.app.slice.Slice);
+ method public java.util.List<androidx.slice.SliceItem> getSliceActions();
+ method public void onChanged(androidx.slice.Slice);
method public void setMode(int);
- method public void setOnSliceActionListener(androidx.app.slice.widget.SliceView.OnSliceActionListener);
+ method public void setOnSliceActionListener(androidx.slice.widget.SliceView.OnSliceActionListener);
method public void setScrollable(boolean);
- method public void setSlice(androidx.app.slice.Slice);
- method public void setSliceActions(java.util.List<androidx.app.slice.SliceItem>);
+ method public void setSlice(androidx.slice.Slice);
+ method public void setSliceActions(java.util.List<androidx.slice.SliceItem>);
method public void setTint(int);
field public static final int MODE_LARGE = 2; // 0x2
field public static final int MODE_SHORTCUT = 3; // 0x3
@@ -91,7 +91,7 @@
}
public static abstract interface SliceView.OnSliceActionListener {
- method public abstract void onSliceAction(androidx.app.slice.widget.EventInfo, androidx.app.slice.SliceItem);
+ method public abstract void onSliceAction(androidx.slice.widget.EventInfo, androidx.slice.SliceItem);
}
}
diff --git a/slices/view/lint-baseline.xml b/slices/view/lint-baseline.xml
index a25ad81..e0d7728 100644
--- a/slices/view/lint-baseline.xml
+++ b/slices/view/lint-baseline.xml
@@ -7,7 +7,7 @@
errorLine1=" if (android.os.Build.VERSION.SDK_INT"
errorLine2=" ^">
<location
- file="src/main/java/androidx/app/slice/SliceXml.java"
+ file="src/main/java/androidx/slice/SliceXml.java"
line="122"
column="33"/>
</issue>
@@ -18,7 +18,7 @@
errorLine1=" if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
- file="src/main/java/androidx/app/slice/SliceXml.java"
+ file="src/main/java/androidx/slice/SliceXml.java"
line="212"
column="25"/>
</issue>
diff --git a/slices/view/src/androidTest/AndroidManifest.xml b/slices/view/src/androidTest/AndroidManifest.xml
index e98f69d..3bb50d5 100644
--- a/slices/view/src/androidTest/AndroidManifest.xml
+++ b/slices/view/src/androidTest/AndroidManifest.xml
@@ -14,25 +14,25 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.app.slice.view.test">
+ package="androidx.slice.view.test">
<uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<application>
- <provider android:name="androidx.app.slice.SliceManagerTest$TestSliceProvider"
- android:authorities="androidx.app.slice.view.test"
+ <provider android:name="androidx.slice.SliceManagerTest$TestSliceProvider"
+ android:authorities="androidx.slice.view.test"
android:exported="true"/>
- <activity android:name="androidx.app.slice.render.SliceRenderActivity"
+ <activity android:name="androidx.slice.render.SliceRenderActivity"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<meta-data android:name="android.metadata.SLICE_URI"
- android:value="content://androidx.app.slice.view.test/render" />
+ android:value="content://androidx.slice.view.test/render" />
</activity>
</application>
</manifest>
diff --git a/slices/view/src/androidTest/java/androidx/app/slice/SliceManagerTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java
similarity index 96%
rename from slices/view/src/androidTest/java/androidx/app/slice/SliceManagerTest.java
rename to slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java
index 3ad623f..bb6e306 100644
--- a/slices/view/src/androidTest/java/androidx/app/slice/SliceManagerTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static junit.framework.Assert.assertEquals;
@@ -46,8 +46,8 @@
import java.util.List;
import java.util.concurrent.Executor;
-import androidx.app.slice.render.SliceRenderActivity;
-import androidx.app.slice.widget.SliceLiveData;
+import androidx.slice.render.SliceRenderActivity;
+import androidx.slice.widget.SliceLiveData;
@RunWith(AndroidJUnit4.class)
@SmallTest
@@ -151,7 +151,7 @@
@Test
public void testMapIntentToUri() {
- Uri expected = Uri.parse("content://androidx.app.slice.view.test/render");
+ Uri expected = Uri.parse("content://androidx.slice.view.test/render");
Slice s = new Slice.Builder(expected).build();
when(mSliceProvider.onBindSlice(eq(expected))).thenReturn(s);
Uri uri = mManager.mapIntentToUri(new Intent(mContext, SliceRenderActivity.class));
diff --git a/slices/view/src/androidTest/java/androidx/app/slice/SliceXmlTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
similarity index 99%
rename from slices/view/src/androidTest/java/androidx/app/slice/SliceXmlTest.java
rename to slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
index 5e4444d..926b72c 100644
--- a/slices/view/src/androidTest/java/androidx/app/slice/SliceXmlTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.SliceItem.FORMAT_ACTION;
diff --git a/slices/view/src/androidTest/java/androidx/app/slice/render/RenderTest.java b/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
similarity index 94%
rename from slices/view/src/androidTest/java/androidx/app/slice/render/RenderTest.java
rename to slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
index 3a71268..deb1f90 100644
--- a/slices/view/src/androidTest/java/androidx/app/slice/render/RenderTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.app.slice.render;
+package androidx.slice.render;
-import static androidx.app.slice.render.SliceRenderer.SCREENSHOT_DIR;
+import static androidx.slice.render.SliceRenderer.SCREENSHOT_DIR;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/slices/view/src/androidTest/java/androidx/app/slice/render/SliceCreator.java b/slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java
similarity index 97%
rename from slices/view/src/androidTest/java/androidx/app/slice/render/SliceCreator.java
rename to slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java
index 546f1e3..cec5ef4 100644
--- a/slices/view/src/androidTest/java/androidx/app/slice/render/SliceCreator.java
+++ b/slices/view/src/androidTest/java/androidx/slice/render/SliceCreator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.render;
+package androidx.slice.render;
import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
@@ -30,12 +30,12 @@
import android.text.format.DateUtils;
import android.text.style.ForegroundColorSpan;
-import androidx.app.slice.Slice;
-import androidx.app.slice.builders.GridBuilder;
-import androidx.app.slice.builders.ListBuilder;
-import androidx.app.slice.builders.MessagingSliceBuilder;
-import androidx.app.slice.builders.SliceAction;
-import androidx.app.slice.view.test.R;
+import androidx.slice.Slice;
+import androidx.slice.builders.GridBuilder;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.MessagingSliceBuilder;
+import androidx.slice.builders.SliceAction;
+import androidx.slice.view.test.R;
/**
* Examples of using slice template builders.
@@ -67,7 +67,7 @@
public static Uri getUri(String path, Context context) {
return new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
- .authority("androidx.app.slice.view.test")
+ .authority("androidx.slice.view.test")
.appendPath(path)
.build();
}
diff --git a/slices/view/src/androidTest/java/androidx/app/slice/render/SliceRenderActivity.java b/slices/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
similarity index 89%
rename from slices/view/src/androidTest/java/androidx/app/slice/render/SliceRenderActivity.java
rename to slices/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
index debb280..a284509 100644
--- a/slices/view/src/androidTest/java/androidx/app/slice/render/SliceRenderActivity.java
+++ b/slices/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.render;
+package androidx.slice.render;
import android.app.Activity;
import android.content.Intent;
@@ -22,7 +22,7 @@
import android.support.annotation.Nullable;
public class SliceRenderActivity extends Activity {
- public static final String ACTION_RENDER_DONE = "androidx.app.slice.render.RENDER_DONE";
+ public static final String ACTION_RENDER_DONE = "androidx.slice.render.RENDER_DONE";
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
diff --git a/slices/view/src/androidTest/java/androidx/app/slice/render/SliceRenderer.java b/slices/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
similarity index 96%
rename from slices/view/src/androidTest/java/androidx/app/slice/render/SliceRenderer.java
rename to slices/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
index dc9196e..ca968db 100644
--- a/slices/view/src/androidTest/java/androidx/app/slice/render/SliceRenderer.java
+++ b/slices/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.render;
+package androidx.slice.render;
import static android.view.View.MeasureSpec.makeMeasureSpec;
@@ -36,11 +36,11 @@
import java.io.FileOutputStream;
import java.util.concurrent.CountDownLatch;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceProvider;
-import androidx.app.slice.view.test.R;
-import androidx.app.slice.widget.SliceLiveData;
-import androidx.app.slice.widget.SliceView;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.view.test.R;
+import androidx.slice.widget.SliceLiveData;
+import androidx.slice.widget.SliceView;
public class SliceRenderer {
diff --git a/slices/view/src/androidTest/res/layout/render_layout.xml b/slices/view/src/androidTest/res/layout/render_layout.xml
index a8ed779..763809d 100644
--- a/slices/view/src/androidTest/res/layout/render_layout.xml
+++ b/slices/view/src/androidTest/res/layout/render_layout.xml
@@ -25,7 +25,7 @@
<FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content">
- <androidx.app.slice.widget.SliceView
+ <androidx.slice.widget.SliceView
android:id="@+id/sv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -34,7 +34,7 @@
<FrameLayout android:layout_width="400dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp">
- <androidx.app.slice.widget.SliceView
+ <androidx.slice.widget.SliceView
android:id="@+id/sv2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
<FrameLayout android:layout_width="400dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp">
- <androidx.app.slice.widget.SliceView
+ <androidx.slice.widget.SliceView
android:id="@+id/sv3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/slices/view/src/main/AndroidManifest.xml b/slices/view/src/main/AndroidManifest.xml
index 9263885..ae0565b 100644
--- a/slices/view/src/main/AndroidManifest.xml
+++ b/slices/view/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.app.slice.view"/>
+<manifest package="androidx.slice.view"/>
diff --git a/slices/view/src/main/java/androidx/app/slice/SliceManager.java b/slices/view/src/main/java/androidx/slice/SliceManager.java
similarity index 98%
rename from slices/view/src/main/java/androidx/app/slice/SliceManager.java
rename to slices/view/src/main/java/androidx/slice/SliceManager.java
index 6d44319..b462189 100644
--- a/slices/view/src/main/java/androidx/app/slice/SliceManager.java
+++ b/slices/view/src/main/java/androidx/slice/SliceManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import android.content.Context;
import android.content.Intent;
@@ -144,7 +144,7 @@
* @param intent The intent associated with a slice.
* @return The Slice provided by the app or null if none is given.
* @see Slice
- * @see androidx.app.slice.SliceProvider#onMapIntentToUri(Intent)
+ * @see androidx.slice.SliceProvider#onMapIntentToUri(Intent)
* @see Intent
*/
public abstract @Nullable Slice bindSlice(@NonNull Intent intent);
diff --git a/slices/view/src/main/java/androidx/app/slice/SliceManagerBase.java b/slices/view/src/main/java/androidx/slice/SliceManagerBase.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/SliceManagerBase.java
rename to slices/view/src/main/java/androidx/slice/SliceManagerBase.java
index 8731658..3b70ef1 100644
--- a/slices/view/src/main/java/androidx/app/slice/SliceManagerBase.java
+++ b/slices/view/src/main/java/androidx/slice/SliceManagerBase.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
-import static androidx.app.slice.widget.SliceLiveData.SUPPORTED_SPECS;
+import static androidx.slice.widget.SliceLiveData.SUPPORTED_SPECS;
import android.content.Context;
import android.database.ContentObserver;
diff --git a/slices/view/src/main/java/androidx/app/slice/SliceManagerCompat.java b/slices/view/src/main/java/androidx/slice/SliceManagerCompat.java
similarity index 90%
rename from slices/view/src/main/java/androidx/app/slice/SliceManagerCompat.java
rename to slices/view/src/main/java/androidx/slice/SliceManagerCompat.java
index 433afd5..078fe6e 100644
--- a/slices/view/src/main/java/androidx/app/slice/SliceManagerCompat.java
+++ b/slices/view/src/main/java/androidx/slice/SliceManagerCompat.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
-import static androidx.app.slice.widget.SliceLiveData.SUPPORTED_SPECS;
+import static androidx.slice.widget.SliceLiveData.SUPPORTED_SPECS;
import android.content.Context;
import android.content.Intent;
@@ -27,8 +27,8 @@
import java.util.List;
-import androidx.app.slice.compat.SliceProviderCompat;
-import androidx.app.slice.widget.SliceLiveData;
+import androidx.slice.compat.SliceProviderCompat;
+import androidx.slice.widget.SliceLiveData;
/**
diff --git a/slices/view/src/main/java/androidx/app/slice/SliceManagerWrapper.java b/slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java
similarity index 86%
rename from slices/view/src/main/java/androidx/app/slice/SliceManagerWrapper.java
rename to slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java
index 76c6a4a..45eebac 100644
--- a/slices/view/src/main/java/androidx/app/slice/SliceManagerWrapper.java
+++ b/slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
-import static androidx.app.slice.SliceConvert.unwrap;
-import static androidx.app.slice.widget.SliceLiveData.SUPPORTED_SPECS;
+import static androidx.slice.SliceConvert.unwrap;
+import static androidx.slice.widget.SliceLiveData.SUPPORTED_SPECS;
import android.app.slice.SliceSpec;
import android.content.Context;
@@ -61,20 +61,20 @@
}
@Override
- public @NonNull List<androidx.app.slice.SliceSpec> getPinnedSpecs(@NonNull Uri uri) {
+ public @NonNull List<androidx.slice.SliceSpec> getPinnedSpecs(@NonNull Uri uri) {
return SliceConvert.wrap(mManager.getPinnedSpecs(uri));
}
@Nullable
@Override
- public androidx.app.slice.Slice bindSlice(@NonNull Uri uri) {
+ public androidx.slice.Slice bindSlice(@NonNull Uri uri) {
return SliceConvert.wrap(android.app.slice.Slice.bindSlice(
mContext.getContentResolver(), uri, mSpecs));
}
@Nullable
@Override
- public androidx.app.slice.Slice bindSlice(@NonNull Intent intent) {
+ public androidx.slice.Slice bindSlice(@NonNull Intent intent) {
return SliceConvert.wrap(android.app.slice.Slice.bindSlice(
mContext, intent, mSpecs));
}
diff --git a/slices/view/src/main/java/androidx/app/slice/SliceUtils.java b/slices/view/src/main/java/androidx/slice/SliceUtils.java
similarity index 98%
rename from slices/view/src/main/java/androidx/app/slice/SliceUtils.java
rename to slices/view/src/main/java/androidx/slice/SliceUtils.java
index 117aee3..9c4e72a 100644
--- a/slices/view/src/main/java/androidx/app/slice/SliceUtils.java
+++ b/slices/view/src/main/java/androidx/slice/SliceUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static android.app.slice.Slice.HINT_ACTIONS;
import static android.app.slice.Slice.HINT_PARTIAL;
@@ -35,12 +35,11 @@
import java.io.OutputStream;
import java.util.List;
-import androidx.app.slice.core.SliceQuery;
+import androidx.slice.core.SliceQuery;
/**
* Utilities for dealing with slices.
*/
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public class SliceUtils {
private SliceUtils() {
diff --git a/slices/view/src/main/java/androidx/app/slice/SliceXml.java b/slices/view/src/main/java/androidx/slice/SliceXml.java
similarity index 99%
rename from slices/view/src/main/java/androidx/app/slice/SliceXml.java
rename to slices/view/src/main/java/androidx/slice/SliceXml.java
index 2500ef6..a075ada 100644
--- a/slices/view/src/main/java/androidx/app/slice/SliceXml.java
+++ b/slices/view/src/main/java/androidx/slice/SliceXml.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice;
+package androidx.slice;
import static org.xmlpull.v1.XmlPullParser.START_TAG;
import static org.xmlpull.v1.XmlPullParser.TEXT;
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/ActionContent.java b/slices/view/src/main/java/androidx/slice/widget/ActionContent.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/widget/ActionContent.java
rename to slices/view/src/main/java/androidx/slice/widget/ActionContent.java
index ba5c70c..7c41b74 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/ActionContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/ActionContent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_SELECTED;
import static android.app.slice.Slice.HINT_SHORTCUT;
@@ -32,8 +32,8 @@
import android.support.annotation.Nullable;
import android.support.annotation.RestrictTo;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
/**
* Extracts information required to present an action button from a slice.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/ActionRow.java b/slices/view/src/main/java/androidx/slice/widget/ActionRow.java
similarity index 98%
rename from slices/view/src/main/java/androidx/app/slice/widget/ActionRow.java
rename to slices/view/src/main/java/androidx/slice/widget/ActionRow.java
index f517061..aa45605 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/ActionRow.java
+++ b/slices/view/src/main/java/androidx/slice/widget/ActionRow.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_NO_TINT;
import static android.app.slice.SliceItem.FORMAT_IMAGE;
@@ -43,8 +43,8 @@
import java.util.List;
import java.util.function.Consumer;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
/**
* @hide
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/EventInfo.java b/slices/view/src/main/java/androidx/slice/widget/EventInfo.java
similarity index 99%
rename from slices/view/src/main/java/androidx/app/slice/widget/EventInfo.java
rename to slices/view/src/main/java/androidx/slice/widget/EventInfo.java
index d45a34d..35786c0 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/EventInfo.java
+++ b/slices/view/src/main/java/androidx/slice/widget/EventInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import android.support.annotation.IntDef;
import android.support.annotation.RestrictTo;
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/GridContent.java b/slices/view/src/main/java/androidx/slice/widget/GridContent.java
similarity index 98%
rename from slices/view/src/main/java/androidx/app/slice/widget/GridContent.java
rename to slices/view/src/main/java/androidx/slice/widget/GridContent.java
index 10a30ac..f883643 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/GridContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/GridContent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_ACTIONS;
import static android.app.slice.Slice.HINT_SHORTCUT;
@@ -37,10 +37,10 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.builders.GridBuilder;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.SliceItem;
+import androidx.slice.builders.GridBuilder;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* Extracts information required to present content in a grid format from a slice.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/GridRowView.java b/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/widget/GridRowView.java
rename to slices/view/src/main/java/androidx/slice/widget/GridRowView.java
index 148730c..4fe63a4 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/GridRowView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_LARGE;
import static android.app.slice.Slice.HINT_NO_TINT;
@@ -26,7 +26,7 @@
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-import static androidx.app.slice.widget.SliceView.MODE_SMALL;
+import static androidx.slice.widget.SliceView.MODE_SMALL;
import android.annotation.TargetApi;
import android.app.PendingIntent;
@@ -55,10 +55,10 @@
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* @hide
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/LargeSliceAdapter.java b/slices/view/src/main/java/androidx/slice/widget/LargeSliceAdapter.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/widget/LargeSliceAdapter.java
rename to slices/view/src/main/java/androidx/slice/widget/LargeSliceAdapter.java
index b64cd01..c69e20f 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/LargeSliceAdapter.java
+++ b/slices/view/src/main/java/androidx/slice/widget/LargeSliceAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_HORIZONTAL;
import static android.app.slice.Slice.SUBTYPE_MESSAGE;
@@ -23,7 +23,7 @@
import static android.app.slice.SliceItem.FORMAT_INT;
import static android.app.slice.SliceItem.FORMAT_TEXT;
-import static androidx.app.slice.widget.SliceView.MODE_LARGE;
+import static androidx.slice.widget.SliceView.MODE_LARGE;
import android.annotation.TargetApi;
import android.app.slice.Slice;
@@ -43,9 +43,9 @@
import java.util.function.Function;
import java.util.stream.Collectors;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* @hide
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/LargeTemplateView.java b/slices/view/src/main/java/androidx/slice/widget/LargeTemplateView.java
similarity index 96%
rename from slices/view/src/main/java/androidx/app/slice/widget/LargeTemplateView.java
rename to slices/view/src/main/java/androidx/slice/widget/LargeTemplateView.java
index bdd1ac5..cde7707 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/LargeTemplateView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/LargeTemplateView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import android.annotation.TargetApi;
import android.content.Context;
@@ -25,8 +25,8 @@
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
/**
* @hide
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/ListContent.java b/slices/view/src/main/java/androidx/slice/widget/ListContent.java
similarity index 96%
rename from slices/view/src/main/java/androidx/app/slice/widget/ListContent.java
rename to slices/view/src/main/java/androidx/slice/widget/ListContent.java
index 246ef0b..d2915cd 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/ListContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/ListContent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_ACTIONS;
import static android.app.slice.Slice.HINT_HORIZONTAL;
@@ -34,10 +34,10 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.SliceUtils;
-import androidx.app.slice.core.SliceQuery;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceUtils;
+import androidx.slice.core.SliceQuery;
/**
* Extracts information required to present content in a list format from a slice.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/MessageView.java b/slices/view/src/main/java/androidx/slice/widget/MessageView.java
similarity index 95%
rename from slices/view/src/main/java/androidx/app/slice/widget/MessageView.java
rename to slices/view/src/main/java/androidx/slice/widget/MessageView.java
index 9c4a705..a8c9777 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/MessageView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/MessageView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.SUBTYPE_SOURCE;
import static android.app.slice.SliceItem.FORMAT_IMAGE;
@@ -33,9 +33,9 @@
import java.util.function.Consumer;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
/**
* @hide
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/RemoteInputView.java b/slices/view/src/main/java/androidx/slice/widget/RemoteInputView.java
similarity index 99%
rename from slices/view/src/main/java/androidx/app/slice/widget/RemoteInputView.java
rename to slices/view/src/main/java/androidx/slice/widget/RemoteInputView.java
index da35018..c795b73 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/RemoteInputView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RemoteInputView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import android.animation.Animator;
import android.annotation.TargetApi;
@@ -48,7 +48,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import androidx.app.slice.view.R;
+import androidx.slice.view.R;
/**
* Host for the remote input.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/RowContent.java b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/widget/RowContent.java
rename to slices/view/src/main/java/androidx/slice/widget/RowContent.java
index a22a37d..cec8ddb 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/RowContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_ACTIONS;
import static android.app.slice.Slice.HINT_SHORTCUT;
@@ -28,7 +28,7 @@
import static android.app.slice.SliceItem.FORMAT_TEXT;
import static android.app.slice.SliceItem.FORMAT_TIMESTAMP;
-import static androidx.app.slice.core.SliceHints.SUBTYPE_RANGE;
+import static androidx.slice.core.SliceHints.SUBTYPE_RANGE;
import android.content.Context;
import android.support.annotation.Nullable;
@@ -39,9 +39,9 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* Extracts information required to present content in a row format from a slice.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/RowView.java b/slices/view/src/main/java/androidx/slice/widget/RowView.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/widget/RowView.java
rename to slices/view/src/main/java/androidx/slice/widget/RowView.java
index bcd4f61..1aca2fa 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/RowView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
import static android.app.slice.Slice.HINT_NO_TINT;
@@ -26,10 +26,10 @@
import static android.app.slice.SliceItem.FORMAT_SLICE;
import static android.app.slice.SliceItem.FORMAT_TIMESTAMP;
-import static androidx.app.slice.core.SliceHints.EXTRA_RANGE_VALUE;
-import static androidx.app.slice.core.SliceHints.SUBTYPE_MAX;
-import static androidx.app.slice.core.SliceHints.SUBTYPE_VALUE;
-import static androidx.app.slice.widget.SliceView.MODE_SMALL;
+import static androidx.slice.core.SliceHints.EXTRA_RANGE_VALUE;
+import static androidx.slice.core.SliceHints.SUBTYPE_MAX;
+import static androidx.slice.core.SliceHints.SUBTYPE_VALUE;
+import static androidx.slice.widget.SliceView.MODE_SMALL;
import android.annotation.TargetApi;
import android.app.PendingIntent;
@@ -55,10 +55,10 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* Row item is in small template format and can be used to construct list items for use
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/ShortcutView.java b/slices/view/src/main/java/androidx/slice/widget/ShortcutView.java
similarity index 97%
rename from slices/view/src/main/java/androidx/app/slice/widget/ShortcutView.java
rename to slices/view/src/main/java/androidx/slice/widget/ShortcutView.java
index 75e97b1..9bf058c 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/ShortcutView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/ShortcutView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_LARGE;
import static android.app.slice.Slice.HINT_TITLE;
@@ -42,10 +42,10 @@
import android.support.annotation.RestrictTo;
import android.widget.ImageView;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* @hide
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/SliceChildView.java b/slices/view/src/main/java/androidx/slice/widget/SliceChildView.java
similarity index 96%
rename from slices/view/src/main/java/androidx/app/slice/widget/SliceChildView.java
rename to slices/view/src/main/java/androidx/slice/widget/SliceChildView.java
index 9768894..435ff1e 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/SliceChildView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/SliceChildView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import android.content.Context;
import android.content.res.TypedArray;
@@ -27,9 +27,9 @@
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.view.R;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.view.R;
/**
* Base class for children views of {@link SliceView}.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/SliceLiveData.java b/slices/view/src/main/java/androidx/slice/widget/SliceLiveData.java
similarity index 95%
rename from slices/view/src/main/java/androidx/app/slice/widget/SliceLiveData.java
rename to slices/view/src/main/java/androidx/slice/widget/SliceLiveData.java
index 5da98d2..10c5106 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/SliceLiveData.java
+++ b/slices/view/src/main/java/androidx/slice/widget/SliceLiveData.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@@ -28,10 +28,10 @@
import java.util.Arrays;
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceManager;
-import androidx.app.slice.SliceSpec;
-import androidx.app.slice.SliceSpecs;
+import androidx.slice.Slice;
+import androidx.slice.SliceManager;
+import androidx.slice.SliceSpec;
+import androidx.slice.SliceSpecs;
/**
* Class with factory methods for creating LiveData that observes slices.
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/SliceView.java b/slices/view/src/main/java/androidx/slice/widget/SliceView.java
similarity index 98%
rename from slices/view/src/main/java/androidx/app/slice/widget/SliceView.java
rename to slices/view/src/main/java/androidx/slice/widget/SliceView.java
index 6e1f0c0..4a53b9d 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/SliceView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/SliceView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import static android.app.slice.Slice.HINT_HORIZONTAL;
import static android.app.slice.Slice.SUBTYPE_COLOR;
@@ -35,11 +35,11 @@
import java.util.List;
-import androidx.app.slice.Slice;
-import androidx.app.slice.SliceItem;
-import androidx.app.slice.SliceUtils;
-import androidx.app.slice.core.SliceQuery;
-import androidx.app.slice.view.R;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceUtils;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.view.R;
/**
* A view for displaying a {@link Slice} which is a piece of app content and actions. SliceView is
diff --git a/slices/view/src/main/java/androidx/app/slice/widget/SliceViewUtil.java b/slices/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
similarity index 99%
rename from slices/view/src/main/java/androidx/app/slice/widget/SliceViewUtil.java
rename to slices/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
index 12fe7c4..d1aabbe 100644
--- a/slices/view/src/main/java/androidx/app/slice/widget/SliceViewUtil.java
+++ b/slices/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.app.slice.widget;
+package androidx.slice.widget;
import android.annotation.TargetApi;
import android.content.Context;
diff --git a/slices/view/src/main/res/layout/abc_slice_grid.xml b/slices/view/src/main/res/layout/abc_slice_grid.xml
index e4cf7c5..c56321d 100644
--- a/slices/view/src/main/res/layout/abc_slice_grid.xml
+++ b/slices/view/src/main/res/layout/abc_slice_grid.xml
@@ -14,11 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<androidx.app.slice.widget.GridRowView
+<androidx.slice.widget.GridRowView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:background="?android:attr/activatedBackgroundIndicator"
android:clipToPadding="false">
-</androidx.app.slice.widget.GridRowView>
+</androidx.slice.widget.GridRowView>
diff --git a/slices/view/src/main/res/layout/abc_slice_message.xml b/slices/view/src/main/res/layout/abc_slice_message.xml
index 9e1fa62..af5642a 100644
--- a/slices/view/src/main/res/layout/abc_slice_message.xml
+++ b/slices/view/src/main/res/layout/abc_slice_message.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<androidx.app.slice.widget.MessageView
+<androidx.slice.widget.MessageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -56,4 +56,4 @@
android:maxLines="10" />
</LinearLayout>
-</androidx.app.slice.widget.MessageView>
+</androidx.slice.widget.MessageView>
diff --git a/slices/view/src/main/res/layout/abc_slice_message_local.xml b/slices/view/src/main/res/layout/abc_slice_message_local.xml
index d35bd60..a05740b 100644
--- a/slices/view/src/main/res/layout/abc_slice_message_local.xml
+++ b/slices/view/src/main/res/layout/abc_slice_message_local.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<androidx.app.slice.widget.MessageView
+<androidx.slice.widget.MessageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -36,4 +36,4 @@
android:background="#ffeeeeee"
android:maxLines="10" />
-</androidx.app.slice.widget.MessageView>
+</androidx.slice.widget.MessageView>
diff --git a/slices/view/src/main/res/layout/abc_slice_remote_input.xml b/slices/view/src/main/res/layout/abc_slice_remote_input.xml
index 293c95a..7b2d7c9 100644
--- a/slices/view/src/main/res/layout/abc_slice_remote_input.xml
+++ b/slices/view/src/main/res/layout/abc_slice_remote_input.xml
@@ -16,14 +16,14 @@
~ limitations under the License.
-->
<!-- LinearLayout -->
-<androidx.app.slice.widget.RemoteInputView
+<androidx.slice.widget.RemoteInputView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/remote_input"
android:background="@drawable/abc_slice_remote_input_bg"
android:layout_height="match_parent"
android:layout_width="match_parent">
- <view class="androidx.app.slice.widget.RemoteInputView$RemoteEditText"
+ <view class="androidx.slice.widget.RemoteInputView$RemoteEditText"
android:id="@+id/remote_input_text"
android:layout_height="match_parent"
android:layout_width="0dp"
@@ -74,4 +74,4 @@
</FrameLayout>
-</androidx.app.slice.widget.RemoteInputView>
\ No newline at end of file
+</androidx.slice.widget.RemoteInputView>
\ No newline at end of file