diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index ddda5d8bb5c..68c9731d8cb 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -34,10 +34,10 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.Map; import java.util.WeakHashMap; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; -import androidx.slice.builders.SliceAction; -import androidx.slice.builders.ListBuilder; +import androidx.app.slice.Slice; +import androidx.app.slice.SliceProvider; +import androidx.app.slice.builders.SliceAction; +import androidx.app.slice.builders.ListBuilder; /** * A {@link SliceProvider} for Settings to enabled inline results in system apps. diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index a1f27d1cabe..e90ea8e9f68 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -35,10 +35,10 @@ import com.android.settings.core.TogglePreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.slice.Slice; -import androidx.slice.builders.SliceAction; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.app.slice.Slice; +import androidx.app.slice.builders.SliceAction; +import androidx.app.slice.builders.ListBuilder; +import androidx.app.slice.builders.ListBuilder.RowBuilder; /** * Utility class to build Slices objects and Preference Controllers based on the Database managed diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index acd296bd0e1..4fca63ad5fb 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -28,7 +28,7 @@ import android.os.Binder; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; -import androidx.slice.Slice; +import androidx.app.slice.Slice; /** * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice. diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 8ddd48a1672..9edae7e39cb 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.slice.Slice; +import androidx.app.slice.Slice; import java.util.HashMap; diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 39b381d4eeb..0fcce5fb19a 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.slice.Slice; +import androidx.app.slice.Slice; @RunWith(SettingsRobolectricTestRunner.class) public class SliceBuilderUtilsTest {