Refactor project paths to match Maven coordinates
Doesn't move sample projects that ship to Maven as artifacts, which
technically violate the guideline but warrant further discussion.
Bug: 191911288
Test: ./gradlew tasks
Merged-In: I1b2c3295c05791ccba66290e58bc1e66f3aecfc0
Change-Id: I1b2c3295c05791ccba66290e58bc1e66f3aecfc0
diff --git a/ads/ads-identifier-benchmark/build.gradle b/ads/ads-identifier-benchmark/build.gradle
index 57fdb60a..5df39ab 100644
--- a/ads/ads-identifier-benchmark/build.gradle
+++ b/ads/ads-identifier-benchmark/build.gradle
@@ -22,10 +22,10 @@
dependencies {
androidTestImplementation(project(":benchmark:benchmark-junit4"))
- androidTestImplementation(project(":ads-identifier-common"))
- androidTestImplementation(project(":ads-identifier"))
- androidTestImplementation(project(":ads-identifier-provider"))
- androidTestImplementation(project(":ads-identifier-testing"))
+ androidTestImplementation(project(":ads:ads-identifier-common"))
+ androidTestImplementation(project(":ads:ads-identifier"))
+ androidTestImplementation(project(":ads:ads-identifier-provider"))
+ androidTestImplementation(project(":ads:ads-identifier-testing"))
androidTestImplementation("androidx.work:work-runtime:2.2.0")
androidTestImplementation(libs.junit)
androidTestImplementation(libs.truth)
diff --git a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
index 5f8aea8..a5b8f03 100644
--- a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
+++ b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
@@ -22,8 +22,7 @@
<!-- Important: disable debuggable for accurate performance results -->
<application
android:name=".AdsIdentifierBenchmarkApplication"
- android:debuggable="false"
- tools:replace="android:debuggable">
+ android:debuggable="false">
<!-- enable profileableByShell for non-intrusive profiling tools -->
<!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
diff --git a/ads/ads-identifier-common/build.gradle b/ads/ads-identifier-common/build.gradle
index e238beb..b280620 100644
--- a/ads/ads-identifier-common/build.gradle
+++ b/ads/ads-identifier-common/build.gradle
@@ -26,7 +26,7 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- testImplementation(project(":ads-identifier-testing"))
+ testImplementation(project(":ads:ads-identifier-testing"))
testImplementation(libs.testRunner)
testImplementation(libs.junit)
testImplementation(libs.truth)
diff --git a/ads/ads-identifier-provider/build.gradle b/ads/ads-identifier-provider/build.gradle
index bcba6a9..d194c02 100644
--- a/ads/ads-identifier-provider/build.gradle
+++ b/ads/ads-identifier-provider/build.gradle
@@ -29,9 +29,9 @@
implementation(libs.autoValueAnnotations)
annotationProcessor(libs.autoValue)
- implementation(project(":ads-identifier-common"))
+ implementation(project(":ads:ads-identifier-common"))
- androidTestImplementation(project(":ads-identifier-testing"))
+ androidTestImplementation(project(":ads:ads-identifier-testing"))
androidTestImplementation(libs.junit)
androidTestImplementation(libs.truth)
androidTestImplementation(libs.testExtJunit)
diff --git a/ads/ads-identifier-provider/integration-tests/testapp/build.gradle b/ads/ads-identifier-provider/integration-tests/testapp/build.gradle
index c5bd590ca..892d230 100644
--- a/ads/ads-identifier-provider/integration-tests/testapp/build.gradle
+++ b/ads/ads-identifier-provider/integration-tests/testapp/build.gradle
@@ -26,7 +26,7 @@
}
dependencies {
- implementation(project(":ads-identifier-provider"))
+ implementation(project(":ads:ads-identifier-provider"))
implementation("androidx.recyclerview:recyclerview:1.0.0")
api("androidx.annotation:annotation:1.1.0")
}
diff --git a/ads/ads-identifier-testing/build.gradle b/ads/ads-identifier-testing/build.gradle
index 21e10e8..e4458f8 100644
--- a/ads/ads-identifier-testing/build.gradle
+++ b/ads/ads-identifier-testing/build.gradle
@@ -19,7 +19,7 @@
}
dependencies {
- implementation(project(":ads-identifier-common"))
+ implementation(project(":ads:ads-identifier-common"))
api("androidx.annotation:annotation:1.1.0")
api(libs.mockitoCore, excludes.bytebuddy)
}
diff --git a/ads/ads-identifier/build.gradle b/ads/ads-identifier/build.gradle
index b89c7f9..a06dc2d 100644
--- a/ads/ads-identifier/build.gradle
+++ b/ads/ads-identifier/build.gradle
@@ -31,9 +31,9 @@
api(libs.guavaListenableFuture)
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation(project(":ads-identifier-common"))
+ implementation(project(":ads:ads-identifier-common"))
- androidTestImplementation(project(":ads-identifier-testing"))
+ androidTestImplementation(project(":ads:ads-identifier-testing"))
androidTestImplementation(libs.junit)
androidTestImplementation(libs.truth)
androidTestImplementation(libs.testExtJunit)
diff --git a/ads/ads-identifier/integration-tests/testapp/build.gradle b/ads/ads-identifier/integration-tests/testapp/build.gradle
index 13723ea..0424562 100644
--- a/ads/ads-identifier/integration-tests/testapp/build.gradle
+++ b/ads/ads-identifier/integration-tests/testapp/build.gradle
@@ -27,7 +27,7 @@
}
dependencies {
- implementation(project(":ads-identifier"))
- implementation(project(":ads-identifier-common"))
+ implementation(project(":ads:ads-identifier"))
+ implementation(project(":ads:ads-identifier-common"))
implementation(libs.guavaAndroid)
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt
index f2eab33..b7e9cf1 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXRootPlugin.kt
@@ -143,7 +143,7 @@
}
if (partiallyDejetifyArchiveTask != null) {
- project(":jetifier-standalone").afterEvaluate { standAloneProject ->
+ project(":jetifier:jetifier-standalone").afterEvaluate { standAloneProject ->
partiallyDejetifyArchiveTask.configure {
it.dependsOn(standAloneProject.tasks.named("installDist"))
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/BuildOnServer.kt b/buildSrc/src/main/kotlin/androidx/build/BuildOnServer.kt
index d09442b..887dc9eb 100644
--- a/buildSrc/src/main/kotlin/androidx/build/BuildOnServer.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/BuildOnServer.kt
@@ -61,7 +61,7 @@
filesNames.add("dokka-public-docs-$buildId.zip")
}
- if (project.findProject(":jetifier-standalone") != null) {
+ if (project.findProject(":jetifier:jetifier-standalone") != null) {
filesNames.add("jetifier-standalone.zip")
filesNames.add("top-of-tree-m2repository-partially-dejetified-$buildId.zip")
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/Jetify.kt b/buildSrc/src/main/kotlin/androidx/build/Jetify.kt
index 1b83318..f2e5dde 100644
--- a/buildSrc/src/main/kotlin/androidx/build/Jetify.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/Jetify.kt
@@ -97,7 +97,7 @@
)
fun Project.partiallyDejetifyArchiveTask(archiveFile: Provider<RegularFile>): TaskProvider<Exec>? {
- return findProject(":jetifier-standalone")?.let { standaloneProject ->
+ return findProject(":jetifier:jetifier-standalone")?.let { standaloneProject ->
val stripTask = stripArchiveForPartialDejetificationTask(archiveFile)
tasks.register("partiallyDejetifyArchive", Exec::class.java) {
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index d5a391b..6f4feee 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -57,7 +57,7 @@
androidTestImplementation(project(":compose:test-utils"))
androidTestImplementation(project(":compose:ui:ui-test-font"))
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(libs.testUiautomator)
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.testRunner)
@@ -118,7 +118,7 @@
androidAndroidTest.dependencies {
implementation(project(":compose:test-utils"))
implementation(project(":compose:ui:ui-test-font"))
- implementation(project(":test-screenshot"))
+ implementation(project(":test:screenshot:test-screenshot"))
implementation(project(":activity:activity-compose"))
implementation(libs.testUiautomator)
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle
index c69aab7..66a3346 100644
--- a/compose/material/material-icons-extended/build.gradle
+++ b/compose/material/material-icons-extended/build.gradle
@@ -53,7 +53,7 @@
androidTestImplementation(project(":compose:foundation:foundation"))
androidTestImplementation(project(":compose:foundation:foundation-layout"))
androidTestImplementation(project(":compose:ui:ui"))
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
androidTestImplementation(project(":compose:test-utils"))
androidTestImplementation(project(":activity:activity-compose"))
@@ -72,7 +72,7 @@
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:foundation:foundation-layout"))
implementation(project(":compose:ui:ui"))
- implementation(project(":test-screenshot"))
+ implementation(project(":test:screenshot:test-screenshot"))
implementation(project(":compose:ui:ui-test-junit4"))
implementation(project(":activity:activity-compose"))
implementation("androidx.appcompat:appcompat:1.3.0-beta01")
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 7c2b8d7..00fa1e5 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -54,7 +54,7 @@
androidTestImplementation(project(":compose:material:material:material-samples"))
androidTestImplementation(project(":compose:test-utils"))
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.junit)
@@ -110,7 +110,7 @@
androidAndroidTest.dependencies {
implementation(project(":compose:material:material:material-samples"))
implementation(project(":compose:test-utils"))
- implementation(project(":test-screenshot"))
+ implementation(project(":test:screenshot:test-screenshot"))
implementation(libs.testRules)
implementation(libs.testRunner)
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle
index 3650967..0af2b73 100644
--- a/compose/test-utils/build.gradle
+++ b/compose/test-utils/build.gradle
@@ -36,7 +36,7 @@
api("androidx.activity:activity:1.2.0")
api(projectOrArtifact(":compose:ui:ui-test-junit4"))
- api(project(":test-screenshot"))
+ api(project(":test:screenshot:test-screenshot"))
implementation(libs.kotlinStdlibCommon)
implementation(projectOrArtifact(":compose:runtime:runtime"))
@@ -77,7 +77,7 @@
api("androidx.activity:activity:1.2.0")
implementation project(":activity:activity-compose")
api(projectOrArtifact(":compose:ui:ui-test-junit4"))
- api(project(":test-screenshot"))
+ api(project(":test:screenshot:test-screenshot"))
// This has stub APIs for access to legacy Android APIs, so we don't want
// any dependency on this module.
compileOnly(projectOrArtifact(":compose:ui:ui-android-stubs"))
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index b1ba557..d188d8c 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -94,7 +94,7 @@
androidTestImplementation(project(":compose:test-utils"))
androidTestImplementation(project(":compose:ui:ui-test-font"))
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation("androidx.recyclerview:recyclerview:1.1.0")
androidTestImplementation("androidx.core:core-ktx:1.1.0")
androidTestImplementation(project(":activity:activity-compose"))
@@ -194,7 +194,7 @@
implementation(project(":compose:test-utils"))
implementation(project(":compose:ui:ui-test-font"))
implementation(project(":compose:ui:ui-test-junit4"))
- implementation(project(":test-screenshot"))
+ implementation(project(":test:screenshot:test-screenshot"))
implementation("androidx.recyclerview:recyclerview:1.1.0")
implementation("androidx.core:core-ktx:1.1.0")
implementation(project(":activity:activity-compose"))
diff --git a/datastore/datastore-preferences-core/build.gradle b/datastore/datastore-preferences-core/build.gradle
index 277984d..8f14bb1 100644
--- a/datastore/datastore-preferences-core/build.gradle
+++ b/datastore/datastore-preferences-core/build.gradle
@@ -31,7 +31,7 @@
dependencies {
bundleInside(project(
- path: ":datastore:datastore-preferences-core:datastore-preferences-proto",
+ path: ":datastore:datastore-preferences-proto",
configuration: "export"
))
api(libs.kotlinStdlib)
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index dee23c3..d0439e9 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -7,10 +7,10 @@
docs(project(":activity:activity"))
docs(project(":activity:activity-compose"))
docs(project(":activity:activity-ktx"))
- docs(project(":ads-identifier"))
- docs(project(":ads-identifier-common"))
- docs(project(":ads-identifier-provider"))
- docs(project(":ads-identifier-testing"))
+ docs(project(":ads:ads-identifier"))
+ docs(project(":ads:ads-identifier-common"))
+ docs(project(":ads:ads-identifier-provider"))
+ docs(project(":ads:ads-identifier-testing"))
docs(project(":annotation:annotation"))
docs(project(":annotation:annotation-experimental"))
docs(project(":appcompat:appcompat"))
@@ -91,20 +91,20 @@
docs(project(":concurrent:concurrent-futures-ktx"))
docs(project(":contentpager:contentpager"))
docs(project(":coordinatorlayout:coordinatorlayout"))
- docs(project(":core-role"))
docs(project(":core:core"))
docs(project(":core:core-animation"))
docs(project(":core:core-animation-testing"))
docs(project(":core:core-appdigest"))
docs(project(":core:core-google-shortcuts"))
docs(project(":core:core-ktx"))
+ docs(project(":core:core-role"))
docs(project(":cursoradapter:cursoradapter"))
docs(project(":customview:customview"))
docs(project(":datastore:datastore"))
docs(project(":datastore:datastore-core"))
docs(project(":datastore:datastore-preferences"))
docs(project(":datastore:datastore-preferences-core"))
- docs(project(":datastore:datastore-preferences-core:datastore-preferences-proto"))
+ docs(project(":datastore:datastore-preferences-proto"))
docs(project(":datastore:datastore-preferences-rxjava2"))
docs(project(":datastore:datastore-preferences-rxjava3"))
docs(project(":datastore:datastore-proto"))
@@ -114,15 +114,15 @@
docs(project(":drawerlayout:drawerlayout"))
docs(project(":dynamicanimation:dynamicanimation"))
docs(project(":dynamicanimation:dynamicanimation-ktx"))
- docs(project(":emoji"))
- docs(project(":emoji-appcompat"))
- docs(project(":emoji-bundled"))
+ docs(project(":emoji:emoji"))
+ docs(project(":emoji:emoji-appcompat"))
+ docs(project(":emoji:emoji-bundled"))
docs(project(":emoji2:emoji2"))
docs(project(":emoji2:emoji2-bundled"))
docs(project(":emoji2:emoji2-views"))
docs(project(":emoji2:emoji2-views-helper"))
- docs(project(":enterprise-feedback"))
- docs(project(":enterprise-feedback-testing"))
+ docs(project(":enterprise:enterprise-feedback"))
+ docs(project(":enterprise:enterprise-feedback-testing"))
docs(project(":exifinterface:exifinterface"))
docs(project(":fragment:fragment"))
docs(project(":fragment:fragment-ktx"))
@@ -221,17 +221,17 @@
docs(project(":security:security-crypto-ktx"))
docs(project(":security:security-identity-credential"))
docs(project(":sharetarget:sharetarget"))
- docs(project(":slice-builders"))
- docs(project(":slice-builders-ktx"))
- docs(project(":slice-core"))
- docs(project(":slice-remotecallback"))
- docs(project(":slice-view"))
+ docs(project(":slice:slice-builders"))
+ docs(project(":slice:slice-builders-ktx"))
+ docs(project(":slice:slice-core"))
+ docs(project(":slice:slice-remotecallback"))
+ docs(project(":slice:slice-view"))
docs(project(":slidingpanelayout:slidingpanelayout"))
docs(project(":sqlite:sqlite"))
docs(project(":sqlite:sqlite-framework"))
docs(project(":sqlite:sqlite-ktx"))
docs(project(":startup:startup-runtime"))
- docs(project(":legacy-support-core-utils"))
+ docs(project(":legacy:legacy-support-core-utils"))
docs(project(":swiperefreshlayout:swiperefreshlayout"))
docs(project(":textclassifier:textclassifier"))
docs(project(":tracing:tracing"))
diff --git a/emoji/appcompat/build.gradle b/emoji/appcompat/build.gradle
index 46412ca..d0a730f 100644
--- a/emoji/appcompat/build.gradle
+++ b/emoji/appcompat/build.gradle
@@ -24,7 +24,7 @@
}
dependencies {
- api(project(":emoji"))
+ api(project(":emoji:emoji"))
api("androidx.appcompat:appcompat:1.1.0")
}
diff --git a/emoji/bundled/build.gradle b/emoji/bundled/build.gradle
index 6629e8d..457de00 100644
--- a/emoji/bundled/build.gradle
+++ b/emoji/bundled/build.gradle
@@ -18,7 +18,7 @@
}
dependencies {
- api(project(":emoji"))
+ api(project(":emoji:emoji"))
}
androidx {
diff --git a/enterprise/feedback/testing/build.gradle b/enterprise/feedback/testing/build.gradle
index ff1db7c..ad1b80e 100644
--- a/enterprise/feedback/testing/build.gradle
+++ b/enterprise/feedback/testing/build.gradle
@@ -22,7 +22,7 @@
id("com.android.library")
}
dependencies {
- api(project(":enterprise-feedback:"))
+ api(project(":enterprise:enterprise-feedback:"))
testImplementation(libs.truth)
}
android {
diff --git a/jetifier/jetifier/preprocessor/build.gradle b/jetifier/jetifier/preprocessor/build.gradle
index 2a764dc..0b91465 100644
--- a/jetifier/jetifier/preprocessor/build.gradle
+++ b/jetifier/jetifier/preprocessor/build.gradle
@@ -23,6 +23,6 @@
mainClassName = "com.android.tools.build.jetifier.preprocessor.MainKt"
dependencies {
- api(project(":jetifier-processor"))
+ api(project(":jetifier:jetifier-processor"))
api("commons-cli:commons-cli:1.3.1")
}
diff --git a/jetifier/jetifier/processor/build.gradle b/jetifier/jetifier/processor/build.gradle
index 7d7049b..c8b60e2 100644
--- a/jetifier/jetifier/processor/build.gradle
+++ b/jetifier/jetifier/processor/build.gradle
@@ -24,7 +24,7 @@
}
dependencies {
- api(project(":jetifier-core"))
+ api(project(":jetifier:jetifier-core"))
api("org.ow2.asm:asm:8.0.1")
api("org.ow2.asm:asm-util:8.0.1")
api("org.ow2.asm:asm-commons:8.0.1")
diff --git a/jetifier/jetifier/standalone/build.gradle b/jetifier/jetifier/standalone/build.gradle
index f1c093e..92d0b42 100644
--- a/jetifier/jetifier/standalone/build.gradle
+++ b/jetifier/jetifier/standalone/build.gradle
@@ -25,7 +25,7 @@
mainClassName = "com.android.tools.build.jetifier.standalone.Main"
dependencies {
- api(project(":jetifier-processor"))
+ api(project(":jetifier:jetifier-processor"))
api("commons-cli:commons-cli:1.3.1")
}
diff --git a/playground-common/playground-include-settings.gradle b/playground-common/playground-include-settings.gradle
index 4d5aedd..b15d217 100644
--- a/playground-common/playground-include-settings.gradle
+++ b/playground-common/playground-include-settings.gradle
@@ -114,7 +114,7 @@
if (name == ":compose:lint:internal-lint-checks") return true
if (name == ":compose:test-utils") return true
if (name == ":compose:lint:common-test") return true
- if (name == ":test-screenshot") return true
+ if (name == ":test:screenshot:test-screenshot") return true
return false
}
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index ee14a35..e2aebce 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -10,7 +10,7 @@
implementation(project(":localbroadcastmanager:localbroadcastmanager"))
implementation(project(":slidingpanelayout:slidingpanelayout"))
implementation(project(":swiperefreshlayout:swiperefreshlayout"))
- implementation(project(":legacy-support-core-utils"))
+ implementation(project(":legacy:legacy-support-core-utils"))
implementation(project(":fragment:fragment-ktx"))
implementation(project(":media:media"))
implementation(project(":viewpager:viewpager"))
diff --git a/samples/SupportSliceDemos/build.gradle b/samples/SupportSliceDemos/build.gradle
index 992ff53..ef57df5 100644
--- a/samples/SupportSliceDemos/build.gradle
+++ b/samples/SupportSliceDemos/build.gradle
@@ -20,10 +20,10 @@
}
dependencies {
- implementation(project(":slice-view"))
- implementation(project(":slice-builders"))
- implementation(project(":slice-core"))
- implementation(project(":slice-test"))
+ implementation(project(":slice:slice-view"))
+ implementation(project(":slice:slice-builders"))
+ implementation(project(":slice:slice-core"))
+ implementation(project(":slice:slice-test"))
implementation(project(":transition:transition"))
implementation(project(":recyclerview:recyclerview"))
implementation(project(":appcompat:appcompat"))
diff --git a/settings.gradle b/settings.gradle
index c009bb1..1245928 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -180,13 +180,13 @@
includeProject(":activity:activity-ktx", "activity/activity-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE])
includeProject(":activity:activity-lint", "activity/activity-lint", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
includeProject(":activity:integration-tests:testapp", "activity/integration-tests/testapp", [BuildType.MAIN])
-includeProject(":ads-identifier", "ads/ads-identifier", [BuildType.MAIN])
-includeProject(":ads-identifier-benchmark", "ads/ads-identifier-benchmark", [BuildType.MAIN])
-includeProject(":ads-identifier-common", "ads/ads-identifier-common", [BuildType.MAIN])
-includeProject(":ads-identifier-provider", "ads/ads-identifier-provider", [BuildType.MAIN])
-includeProject(":ads-identifier-provider:integration-tests:testapp", "ads/ads-identifier-provider/integration-tests/testapp", [BuildType.MAIN])
-includeProject(":ads-identifier-testing", "ads/ads-identifier-testing", [BuildType.MAIN])
-includeProject(":ads-identifier:integration-tests:testapp", "ads/ads-identifier/integration-tests/testapp", [BuildType.MAIN])
+includeProject(":ads:ads-identifier", "ads/ads-identifier", [BuildType.MAIN])
+includeProject(":ads:ads-identifier-benchmark", "ads/ads-identifier-benchmark", [BuildType.MAIN])
+includeProject(":ads:ads-identifier-common", "ads/ads-identifier-common", [BuildType.MAIN])
+includeProject(":ads:ads-identifier-provider", "ads/ads-identifier-provider", [BuildType.MAIN])
+includeProject(":ads:ads-identifier-provider:integration-tests:testapp", "ads/ads-identifier-provider/integration-tests/testapp", [BuildType.MAIN])
+includeProject(":ads:ads-identifier-testing", "ads/ads-identifier-testing", [BuildType.MAIN])
+includeProject(":ads:ads-identifier:integration-tests:testapp", "ads/ads-identifier/integration-tests/testapp", [BuildType.MAIN])
includeProject(":annotation:annotation", "annotation/annotation")
includeProject(":annotation:annotation-experimental", "annotation/annotation-experimental")
includeProject(":annotation:annotation-experimental-lint", "annotation/annotation-experimental-lint")
@@ -375,7 +375,6 @@
includeProject(":concurrent:concurrent-futures-ktx", "concurrent/futures-ktx", [BuildType.MAIN])
includeProject(":contentpager:contentpager", "contentpager/contentpager", [BuildType.MAIN])
includeProject(":coordinatorlayout:coordinatorlayout", "coordinatorlayout/coordinatorlayout", [BuildType.MAIN])
-includeProject(":core-role", "core/core-role", [BuildType.MAIN])
includeProject(":core:core", "core/core", [BuildType.MAIN, BuildType.MEDIA])
includeProject(":core:core-animation", "core/core-animation", [BuildType.MAIN])
includeProject(":core:core-animation-integration-tests:testapp", "core/core-animation-integration-tests/testapp", [BuildType.MAIN])
@@ -383,6 +382,7 @@
includeProject(":core:core-appdigest", "core/core-appdigest", [BuildType.MAIN])
includeProject(":core:core-google-shortcuts", "core/core-google-shortcuts", [BuildType.MAIN])
includeProject(":core:core-ktx", "core/core-ktx", [BuildType.MAIN])
+includeProject(":core:core-role", "core/core-role", [BuildType.MAIN])
includeProject(":cursoradapter:cursoradapter", "cursoradapter/cursoradapter", [BuildType.MAIN])
includeProject(":customview:customview", "customview/customview", [BuildType.MAIN])
includeProject(":datastore:datastore", "datastore/datastore", [BuildType.MAIN])
@@ -390,7 +390,7 @@
includeProject(":datastore:datastore-preferences", "datastore/datastore-preferences", [BuildType.MAIN])
includeProject(":datastore:datastore-preferences-core", "datastore/datastore-preferences-core",
[BuildType.MAIN])
-includeProject(":datastore:datastore-preferences-core:datastore-preferences-proto",
+includeProject(":datastore:datastore-preferences-proto",
"datastore/datastore-preferences-core/datastore-preferences-proto", [BuildType.MAIN])
includeProject(":datastore:datastore-preferences-rxjava2",
"datastore/datastore-preferences-rxjava2", [BuildType.MAIN])
@@ -405,9 +405,9 @@
includeProject(":dynamicanimation", "dynamic-animation", [BuildType.MAIN])
includeProject(":dynamicanimation:dynamicanimation", "dynamic-animation/dynamic-animation", [BuildType.MAIN])
includeProject(":dynamicanimation:dynamicanimation-ktx", "dynamic-animation/dynamic-animation-ktx", [BuildType.MAIN])
-includeProject(":emoji", "emoji/core", [BuildType.MAIN])
-includeProject(":emoji-appcompat", "emoji/appcompat", [BuildType.MAIN])
-includeProject(":emoji-bundled", "emoji/bundled", [BuildType.MAIN])
+includeProject(":emoji:emoji", "emoji/core", [BuildType.MAIN])
+includeProject(":emoji:emoji-appcompat", "emoji/appcompat", [BuildType.MAIN])
+includeProject(":emoji:emoji-bundled", "emoji/bundled", [BuildType.MAIN])
includeProject(":emoji2:emoji2", "emoji2/emoji2", [BuildType.MAIN])
includeProject(":emoji2:emoji2-bundled", "emoji2/emoji2-bundled", [BuildType.MAIN])
includeProject(":emoji2:emoji2-views", "emoji2/emoji2-views", [BuildType.MAIN])
@@ -417,8 +417,8 @@
includeProject(":emoji2:integration-tests:init-disabled-macrobenchmark-target", "emoji2/integration-tests/init-disabled-macrobenchmark-target", [BuildType.MAIN])
includeProject(":emoji2:integration-tests:init-enabled-macrobenchmark", "emoji2/integration-tests/init-enabled-macrobenchmark", [BuildType.MAIN])
includeProject(":emoji2:integration-tests:init-enabled-macrobenchmark-target", "emoji2/integration-tests/init-enabled-macrobenchmark-target", [BuildType.MAIN])
-includeProject(":enterprise-feedback", "enterprise/feedback", [BuildType.MAIN])
-includeProject(":enterprise-feedback-testing", "enterprise/feedback/testing", [BuildType.MAIN])
+includeProject(":enterprise:enterprise-feedback", "enterprise/feedback", [BuildType.MAIN])
+includeProject(":enterprise:enterprise-feedback-testing", "enterprise/feedback/testing", [BuildType.MAIN])
includeProject(":exifinterface:exifinterface", "exifinterface/exifinterface", [BuildType.MAIN])
includeProject(":fakeannotations", "fakeannotations", [BuildType.MAIN])
includeProject(":fragment:fragment", "fragment/fragment", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
@@ -444,10 +444,10 @@
includeProject(":inspection:inspection-gradle-plugin", "inspection/inspection-gradle-plugin", [BuildType.MAIN])
includeProject(":inspection:inspection-testing", "inspection/inspection-testing", [BuildType.MAIN, BuildType.COMPOSE])
includeProject(":interpolator:interpolator", "interpolator/interpolator", [BuildType.MAIN])
-includeProject(":jetifier-core", "jetifier/jetifier/core", [BuildType.MAIN])
-includeProject(":jetifier-preprocessor", "jetifier/jetifier/preprocessor", [BuildType.MAIN])
-includeProject(":jetifier-processor", "jetifier/jetifier/processor", [BuildType.MAIN])
-includeProject(":jetifier-standalone", "jetifier/jetifier/standalone", [BuildType.MAIN])
+includeProject(":jetifier:jetifier-core", "jetifier/jetifier/core", [BuildType.MAIN])
+includeProject(":jetifier:jetifier-preprocessor", "jetifier/jetifier/preprocessor", [BuildType.MAIN])
+includeProject(":jetifier:jetifier-processor", "jetifier/jetifier/processor", [BuildType.MAIN])
+includeProject(":jetifier:jetifier-standalone", "jetifier/jetifier/standalone", [BuildType.MAIN])
includeProject(":leanback:leanback", "leanback/leanback", [BuildType.MAIN])
includeProject(":leanback:leanback-paging", "leanback/leanback-paging", [BuildType.MAIN])
includeProject(":leanback:leanback-preference", "leanback/leanback-preference", [BuildType.MAIN])
@@ -574,13 +574,13 @@
includeProject(":security:security-identity-credential", "security/identity-credential", [BuildType.MAIN])
includeProject(":sharetarget:integration-tests:testapp", "sharetarget/integration-tests/testapp", [BuildType.MAIN])
includeProject(":sharetarget:sharetarget", "sharetarget/sharetarget", [BuildType.MAIN])
-includeProject(":slice-benchmark", "slices/benchmark", [BuildType.MAIN])
-includeProject(":slice-builders", "slices/builders", [BuildType.MAIN])
-includeProject(":slice-builders-ktx", "slices/builders/ktx", [BuildType.MAIN])
-includeProject(":slice-core", "slices/core", [BuildType.MAIN])
-includeProject(":slice-remotecallback", "slices/remotecallback", [BuildType.MAIN])
-includeProject(":slice-test", "slices/test", [BuildType.MAIN])
-includeProject(":slice-view", "slices/view", [BuildType.MAIN])
+includeProject(":slice:slice-benchmark", "slice/benchmark", [BuildType.MAIN])
+includeProject(":slice:slice-builders", "slice/builders", [BuildType.MAIN])
+includeProject(":slice:slice-builders-ktx", "slice/builders/ktx", [BuildType.MAIN])
+includeProject(":slice:slice-core", "slice/core", [BuildType.MAIN])
+includeProject(":slice:slice-remotecallback", "slice/remotecallback", [BuildType.MAIN])
+includeProject(":slice:slice-test", "slice/test", [BuildType.MAIN])
+includeProject(":slice:slice-view", "slice/view", [BuildType.MAIN])
includeProject(":slidingpanelayout:slidingpanelayout", "slidingpanelayout/slidingpanelayout", [BuildType.MAIN, BuildType.FLAN])
includeProject(":sqlite:integration-tests:inspection-room-testapp", "sqlite/integration-tests/inspection-room-testapp", [BuildType.MAIN])
includeProject(":sqlite:integration-tests:inspection-sqldelight-testapp", "sqlite/integration-tests/inspection-sqldelight-testapp", [BuildType.MAIN])
@@ -594,8 +594,8 @@
includeProject(":startup:startup-runtime", "startup/startup-runtime", [BuildType.MAIN])
includeProject(":startup:startup-runtime-lint", "startup/startup-runtime-lint", [BuildType.MAIN])
includeProject(":swiperefreshlayout:swiperefreshlayout", "swiperefreshlayout/swiperefreshlayout", [BuildType.MAIN])
-includeProject(":test-screenshot", "test/screenshot")
-includeProject(":test-screenshot-proto", "test/screenshot/proto", [BuildType.MAIN])
+includeProject(":test:screenshot:test-screenshot", "test/screenshot")
+includeProject(":test:screenshot:test-screenshot-proto", "test/screenshot/proto", [BuildType.MAIN])
includeProject(":text:text", "text/text", [BuildType.COMPOSE])
includeProject(":textclassifier:integration-tests:testapp", "textclassifier/integration-tests/testapp", [BuildType.MAIN])
includeProject(":textclassifier:textclassifier", "textclassifier/textclassifier", [BuildType.MAIN])
@@ -603,8 +603,7 @@
includeProject(":tracing:tracing-ktx", "tracing/tracing-ktx")
includeProject(":transition:transition", "transition/transition", [BuildType.MAIN, BuildType.FLAN])
includeProject(":transition:transition-ktx", "transition/transition-ktx", [BuildType.MAIN, BuildType.FLAN])
-includeProject(":tvprovider", "tv-provider", [BuildType.MAIN])
-includeProject(":tvprovider:tvprovider", "tv-provider/tv-provider", [BuildType.MAIN])
+includeProject(":tvprovider:tvprovider", "tvprovider/tv-provider", [BuildType.MAIN])
includeProject(":vectordrawable:integration-tests:testapp", "vectordrawable/integration-tests/testapp", [BuildType.MAIN])
includeProject(":vectordrawable:vectordrawable", "vectordrawable/vectordrawable", [BuildType.MAIN])
includeProject(":vectordrawable:vectordrawable-animated", "vectordrawable/vectordrawable-animated", [BuildType.MAIN])
@@ -674,7 +673,7 @@
//
/////////////////////////////
-includeProject(":legacy-support-core-utils", "legacy/core-utils", [BuildType.MAIN])
+includeProject(":legacy:legacy-support-core-utils", "legacy/core-utils", [BuildType.MAIN])
/////////////////////////////
//
diff --git a/slices/OWNERS b/slice/OWNERS
similarity index 100%
rename from slices/OWNERS
rename to slice/OWNERS
diff --git a/slices/benchmark/build.gradle b/slice/benchmark/build.gradle
similarity index 89%
rename from slices/benchmark/build.gradle
rename to slice/benchmark/build.gradle
index 97aeb78..92deb77 100644
--- a/slices/benchmark/build.gradle
+++ b/slice/benchmark/build.gradle
@@ -26,9 +26,9 @@
dependencies {
androidTestImplementation("androidx.core:core:1.3.0-beta01")
- androidTestImplementation(project(":slice-view"))
- androidTestImplementation(project(":slice-core"))
- androidTestImplementation(project(":slice-builders"))
+ androidTestImplementation(project(":slice:slice-view"))
+ androidTestImplementation(project(":slice:slice-core"))
+ androidTestImplementation(project(":slice:slice-builders"))
androidTestImplementation(project(":benchmark:benchmark-junit4"))
androidTestImplementation(libs.junit)
androidTestImplementation(libs.testExtJunit)
diff --git a/slices/benchmark/src/androidTest/AndroidManifest.xml b/slice/benchmark/src/androidTest/AndroidManifest.xml
similarity index 92%
rename from slices/benchmark/src/androidTest/AndroidManifest.xml
rename to slice/benchmark/src/androidTest/AndroidManifest.xml
index 8e2298b..570a690 100644
--- a/slices/benchmark/src/androidTest/AndroidManifest.xml
+++ b/slice/benchmark/src/androidTest/AndroidManifest.xml
@@ -21,8 +21,7 @@
<!-- Important: disable debuggable for accurate performance results -->
<application
- android:debuggable="false"
- tools:replace="android:debuggable">
+ android:debuggable="false">
<!-- enable profileableByShell for non-intrusive profiling tools -->
<!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
diff --git a/slices/benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java b/slice/benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java
similarity index 100%
rename from slices/benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java
rename to slice/benchmark/src/androidTest/java/androidx/slice/SliceSerializeMetrics.java
diff --git a/slices/benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java b/slice/benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java
similarity index 100%
rename from slices/benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java
rename to slice/benchmark/src/androidTest/java/androidx/slice/SliceViewMetrics.java
diff --git a/slices/benchmark/src/androidTest/res/raw/slice.vp b/slice/benchmark/src/androidTest/res/raw/slice.vp
similarity index 100%
rename from slices/benchmark/src/androidTest/res/raw/slice.vp
rename to slice/benchmark/src/androidTest/res/raw/slice.vp
Binary files differ
diff --git a/slices/benchmark/src/main/AndroidManifest.xml b/slice/benchmark/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/benchmark/src/main/AndroidManifest.xml
rename to slice/benchmark/src/main/AndroidManifest.xml
diff --git a/slices/builders/api/api_lint.ignore b/slice/builders/api/api_lint.ignore
similarity index 100%
rename from slices/builders/api/api_lint.ignore
rename to slice/builders/api/api_lint.ignore
diff --git a/slices/builders/api/current.txt b/slice/builders/api/current.txt
similarity index 100%
rename from slices/builders/api/current.txt
rename to slice/builders/api/current.txt
diff --git a/slices/builders/api/public_plus_experimental_1.0.0.txt b/slice/builders/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from slices/builders/api/public_plus_experimental_1.0.0.txt
rename to slice/builders/api/public_plus_experimental_1.0.0.txt
diff --git a/slices/builders/api/public_plus_experimental_current.txt b/slice/builders/api/public_plus_experimental_current.txt
similarity index 100%
rename from slices/builders/api/public_plus_experimental_current.txt
rename to slice/builders/api/public_plus_experimental_current.txt
diff --git a/slices/builders/api/res-current.txt b/slice/builders/api/res-current.txt
similarity index 100%
rename from slices/builders/api/res-current.txt
rename to slice/builders/api/res-current.txt
diff --git a/slices/builders/api/restricted_1.0.0.txt b/slice/builders/api/restricted_1.0.0.txt
similarity index 100%
rename from slices/builders/api/restricted_1.0.0.txt
rename to slice/builders/api/restricted_1.0.0.txt
diff --git a/slices/builders/api/restricted_current.txt b/slice/builders/api/restricted_current.txt
similarity index 100%
rename from slices/builders/api/restricted_current.txt
rename to slice/builders/api/restricted_current.txt
diff --git a/slices/builders/api_legacy/current.txt b/slice/builders/api_legacy/current.txt
similarity index 100%
rename from slices/builders/api_legacy/current.txt
rename to slice/builders/api_legacy/current.txt
diff --git a/slices/builders/build.gradle b/slice/builders/build.gradle
similarity index 96%
rename from slices/builders/build.gradle
rename to slice/builders/build.gradle
index 038f13f..338e8708 100644
--- a/slices/builders/build.gradle
+++ b/slice/builders/build.gradle
@@ -24,7 +24,7 @@
}
dependencies {
- implementation(project(":slice-core"))
+ implementation(project(":slice:slice-core"))
api("androidx.remotecallback:remotecallback:1.0.0-alpha02")
api("androidx.annotation:annotation:1.1.0")
implementation("androidx.core:core:1.1.0")
diff --git a/slices/builders/ktx/OWNERS b/slice/builders/ktx/OWNERS
similarity index 100%
rename from slices/builders/ktx/OWNERS
rename to slice/builders/ktx/OWNERS
diff --git a/slices/builders/ktx/api/current.txt b/slice/builders/ktx/api/current.txt
similarity index 100%
rename from slices/builders/ktx/api/current.txt
rename to slice/builders/ktx/api/current.txt
diff --git a/slices/builders/ktx/api/public_plus_experimental_current.txt b/slice/builders/ktx/api/public_plus_experimental_current.txt
similarity index 100%
rename from slices/builders/ktx/api/public_plus_experimental_current.txt
rename to slice/builders/ktx/api/public_plus_experimental_current.txt
diff --git a/slices/builders/ktx/api/res-current.txt b/slice/builders/ktx/api/res-current.txt
similarity index 100%
rename from slices/builders/ktx/api/res-current.txt
rename to slice/builders/ktx/api/res-current.txt
diff --git a/slices/builders/ktx/api/restricted_current.txt b/slice/builders/ktx/api/restricted_current.txt
similarity index 100%
rename from slices/builders/ktx/api/restricted_current.txt
rename to slice/builders/ktx/api/restricted_current.txt
diff --git a/slices/builders/ktx/build.gradle b/slice/builders/ktx/build.gradle
similarity index 94%
rename from slices/builders/ktx/build.gradle
rename to slice/builders/ktx/build.gradle
index 3d668da..ed46d1b 100644
--- a/slices/builders/ktx/build.gradle
+++ b/slice/builders/ktx/build.gradle
@@ -31,10 +31,10 @@
}
dependencies {
- implementation(project(":slice-core"))
+ implementation(project(":slice:slice-core"))
api "androidx.annotation:annotation:1.1.0"
implementation("androidx.core:core:1.3.0-beta01")
- api(project(":slice-builders"))
+ api(project(":slice:slice-builders"))
api(libs.kotlinStdlib)
androidTestImplementation(libs.junit)
diff --git a/slices/builders/ktx/src/androidTest/AndroidManifest.xml b/slice/builders/ktx/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slices/builders/ktx/src/androidTest/AndroidManifest.xml
rename to slice/builders/ktx/src/androidTest/AndroidManifest.xml
diff --git a/slices/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt b/slice/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
similarity index 100%
rename from slices/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
rename to slice/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
diff --git a/slices/builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java b/slice/builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java
similarity index 100%
rename from slices/builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java
rename to slice/builders/ktx/src/androidTest/java/androidx/slice/builders/TestActivity.java
diff --git a/slices/builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml b/slice/builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml
similarity index 100%
rename from slices/builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml
rename to slice/builders/ktx/src/androidTest/res/drawable/ic_all_out_black_24dp.xml
diff --git a/slices/builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml b/slice/builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml
similarity index 100%
rename from slices/builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml
rename to slice/builders/ktx/src/androidTest/res/drawable/ic_android_black_24dp.xml
diff --git a/slices/builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml b/slice/builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml
similarity index 100%
rename from slices/builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml
rename to slice/builders/ktx/src/androidTest/res/drawable/ic_attach_money_black_24dp.xml
diff --git a/slices/builders/ktx/src/androidTest/res/layout/activity_test.xml b/slice/builders/ktx/src/androidTest/res/layout/activity_test.xml
similarity index 100%
rename from slices/builders/ktx/src/androidTest/res/layout/activity_test.xml
rename to slice/builders/ktx/src/androidTest/res/layout/activity_test.xml
diff --git a/slices/builders/ktx/src/main/AndroidManifest.xml b/slice/builders/ktx/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/builders/ktx/src/main/AndroidManifest.xml
rename to slice/builders/ktx/src/main/AndroidManifest.xml
diff --git a/slices/builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt b/slice/builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt
similarity index 100%
rename from slices/builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt
rename to slice/builders/ktx/src/main/java/androidx/slice/builders/GridRowBuilder.kt
diff --git a/slices/builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt b/slice/builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt
similarity index 100%
rename from slices/builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt
rename to slice/builders/ktx/src/main/java/androidx/slice/builders/ListBuilder.kt
diff --git a/slices/builders/lint-baseline.xml b/slice/builders/lint-baseline.xml
similarity index 100%
rename from slices/builders/lint-baseline.xml
rename to slice/builders/lint-baseline.xml
diff --git a/slices/builders/src/main/AndroidManifest.xml b/slice/builders/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/builders/src/main/AndroidManifest.xml
rename to slice/builders/src/main/AndroidManifest.xml
diff --git a/slices/builders/src/main/java/androidx/slice/builders/GridRowBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/GridRowBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/GridRowBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/GridRowBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/ListBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/ListBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/MessagingSliceBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/SelectionBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/SelectionBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/SelectionBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/SelectionBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/SliceAction.java b/slice/builders/src/main/java/androidx/slice/builders/SliceAction.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/SliceAction.java
rename to slice/builders/src/main/java/androidx/slice/builders/SliceAction.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/TemplateSliceBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java b/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/MessagingBuilder.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java b/slice/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
similarity index 100%
rename from slices/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
rename to slice/builders/src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java
diff --git a/slices/core/api/api_lint.ignore b/slice/core/api/api_lint.ignore
similarity index 100%
rename from slices/core/api/api_lint.ignore
rename to slice/core/api/api_lint.ignore
diff --git a/slices/core/api/current.txt b/slice/core/api/current.txt
similarity index 100%
rename from slices/core/api/current.txt
rename to slice/core/api/current.txt
diff --git a/slices/core/api/public_plus_experimental_1.0.0.txt b/slice/core/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from slices/core/api/public_plus_experimental_1.0.0.txt
rename to slice/core/api/public_plus_experimental_1.0.0.txt
diff --git a/slices/core/api/public_plus_experimental_current.txt b/slice/core/api/public_plus_experimental_current.txt
similarity index 100%
rename from slices/core/api/public_plus_experimental_current.txt
rename to slice/core/api/public_plus_experimental_current.txt
diff --git a/slices/core/api/res-current.txt b/slice/core/api/res-current.txt
similarity index 100%
rename from slices/core/api/res-current.txt
rename to slice/core/api/res-current.txt
diff --git a/slices/core/api/restricted_1.0.0.txt b/slice/core/api/restricted_1.0.0.txt
similarity index 100%
rename from slices/core/api/restricted_1.0.0.txt
rename to slice/core/api/restricted_1.0.0.txt
diff --git a/slices/core/api/restricted_current.txt b/slice/core/api/restricted_current.txt
similarity index 100%
rename from slices/core/api/restricted_current.txt
rename to slice/core/api/restricted_current.txt
diff --git a/slices/core/api_legacy/current.txt b/slice/core/api_legacy/current.txt
similarity index 100%
rename from slices/core/api_legacy/current.txt
rename to slice/core/api_legacy/current.txt
diff --git a/slices/core/build.gradle b/slice/core/build.gradle
similarity index 100%
rename from slices/core/build.gradle
rename to slice/core/build.gradle
diff --git a/slices/core/lint-baseline.xml b/slice/core/lint-baseline.xml
similarity index 100%
rename from slices/core/lint-baseline.xml
rename to slice/core/lint-baseline.xml
diff --git a/slices/core/src/androidTest/AndroidManifest.xml b/slice/core/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slices/core/src/androidTest/AndroidManifest.xml
rename to slice/core/src/androidTest/AndroidManifest.xml
diff --git a/slices/core/src/androidTest/java/androidx/slice/SliceItemTest.java b/slice/core/src/androidTest/java/androidx/slice/SliceItemTest.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/SliceItemTest.java
rename to slice/core/src/androidTest/java/androidx/slice/SliceItemTest.java
diff --git a/slices/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java b/slice/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
rename to slice/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
diff --git a/slices/core/src/androidTest/java/androidx/slice/SliceTest.java b/slice/core/src/androidTest/java/androidx/slice/SliceTest.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/SliceTest.java
rename to slice/core/src/androidTest/java/androidx/slice/SliceTest.java
diff --git a/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java b/slice/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
rename to slice/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
diff --git a/slices/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java b/slice/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
rename to slice/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
diff --git a/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java b/slice/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
rename to slice/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
diff --git a/slices/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java b/slice/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
similarity index 100%
rename from slices/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
rename to slice/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
diff --git a/slices/core/src/androidTest/res/drawable/size_48x48.jpg b/slice/core/src/androidTest/res/drawable/size_48x48.jpg
similarity index 100%
rename from slices/core/src/androidTest/res/drawable/size_48x48.jpg
rename to slice/core/src/androidTest/res/drawable/size_48x48.jpg
Binary files differ
diff --git a/slices/core/src/main/AndroidManifest.xml b/slice/core/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/core/src/main/AndroidManifest.xml
rename to slice/core/src/main/AndroidManifest.xml
diff --git a/slices/core/src/main/java/androidx/slice/ArrayUtils.java b/slice/core/src/main/java/androidx/slice/ArrayUtils.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/ArrayUtils.java
rename to slice/core/src/main/java/androidx/slice/ArrayUtils.java
diff --git a/slices/core/src/main/java/androidx/slice/Clock.java b/slice/core/src/main/java/androidx/slice/Clock.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/Clock.java
rename to slice/core/src/main/java/androidx/slice/Clock.java
diff --git a/slices/core/src/main/java/androidx/slice/CornerDrawable.java b/slice/core/src/main/java/androidx/slice/CornerDrawable.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/CornerDrawable.java
rename to slice/core/src/main/java/androidx/slice/CornerDrawable.java
diff --git a/slices/core/src/main/java/androidx/slice/Slice.java b/slice/core/src/main/java/androidx/slice/Slice.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/Slice.java
rename to slice/core/src/main/java/androidx/slice/Slice.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceConvert.java b/slice/core/src/main/java/androidx/slice/SliceConvert.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceConvert.java
rename to slice/core/src/main/java/androidx/slice/SliceConvert.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceItem.java b/slice/core/src/main/java/androidx/slice/SliceItem.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceItem.java
rename to slice/core/src/main/java/androidx/slice/SliceItem.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceItemHolder.java b/slice/core/src/main/java/androidx/slice/SliceItemHolder.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceItemHolder.java
rename to slice/core/src/main/java/androidx/slice/SliceItemHolder.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceManager.java b/slice/core/src/main/java/androidx/slice/SliceManager.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceManager.java
rename to slice/core/src/main/java/androidx/slice/SliceManager.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceManagerCompat.java b/slice/core/src/main/java/androidx/slice/SliceManagerCompat.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceManagerCompat.java
rename to slice/core/src/main/java/androidx/slice/SliceManagerCompat.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceManagerWrapper.java b/slice/core/src/main/java/androidx/slice/SliceManagerWrapper.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceManagerWrapper.java
rename to slice/core/src/main/java/androidx/slice/SliceManagerWrapper.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceProvider.java b/slice/core/src/main/java/androidx/slice/SliceProvider.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceProvider.java
rename to slice/core/src/main/java/androidx/slice/SliceProvider.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceSpec.java b/slice/core/src/main/java/androidx/slice/SliceSpec.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceSpec.java
rename to slice/core/src/main/java/androidx/slice/SliceSpec.java
diff --git a/slices/core/src/main/java/androidx/slice/SliceSpecs.java b/slice/core/src/main/java/androidx/slice/SliceSpecs.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SliceSpecs.java
rename to slice/core/src/main/java/androidx/slice/SliceSpecs.java
diff --git a/slices/core/src/main/java/androidx/slice/SystemClock.java b/slice/core/src/main/java/androidx/slice/SystemClock.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/SystemClock.java
rename to slice/core/src/main/java/androidx/slice/SystemClock.java
diff --git a/slices/core/src/main/java/androidx/slice/compat/CompatPermissionManager.java b/slice/core/src/main/java/androidx/slice/compat/CompatPermissionManager.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/compat/CompatPermissionManager.java
rename to slice/core/src/main/java/androidx/slice/compat/CompatPermissionManager.java
diff --git a/slices/core/src/main/java/androidx/slice/compat/CompatPinnedList.java b/slice/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
rename to slice/core/src/main/java/androidx/slice/compat/CompatPinnedList.java
diff --git a/slices/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java b/slice/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
rename to slice/core/src/main/java/androidx/slice/compat/SlicePermissionActivity.java
diff --git a/slices/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java b/slice/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
rename to slice/core/src/main/java/androidx/slice/compat/SliceProviderCompat.java
diff --git a/slices/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java b/slice/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
rename to slice/core/src/main/java/androidx/slice/compat/SliceProviderWrapperContainer.java
diff --git a/slices/core/src/main/java/androidx/slice/core/SliceAction.java b/slice/core/src/main/java/androidx/slice/core/SliceAction.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/core/SliceAction.java
rename to slice/core/src/main/java/androidx/slice/core/SliceAction.java
diff --git a/slices/core/src/main/java/androidx/slice/core/SliceActionImpl.java b/slice/core/src/main/java/androidx/slice/core/SliceActionImpl.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/core/SliceActionImpl.java
rename to slice/core/src/main/java/androidx/slice/core/SliceActionImpl.java
diff --git a/slices/core/src/main/java/androidx/slice/core/SliceHints.java b/slice/core/src/main/java/androidx/slice/core/SliceHints.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/core/SliceHints.java
rename to slice/core/src/main/java/androidx/slice/core/SliceHints.java
diff --git a/slices/core/src/main/java/androidx/slice/core/SliceQuery.java b/slice/core/src/main/java/androidx/slice/core/SliceQuery.java
similarity index 100%
rename from slices/core/src/main/java/androidx/slice/core/SliceQuery.java
rename to slice/core/src/main/java/androidx/slice/core/SliceQuery.java
diff --git a/slices/core/src/main/res-public/values-af/strings.xml b/slice/core/src/main/res-public/values-af/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-af/strings.xml
rename to slice/core/src/main/res-public/values-af/strings.xml
diff --git a/slices/core/src/main/res-public/values-am/strings.xml b/slice/core/src/main/res-public/values-am/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-am/strings.xml
rename to slice/core/src/main/res-public/values-am/strings.xml
diff --git a/slices/core/src/main/res-public/values-ar/strings.xml b/slice/core/src/main/res-public/values-ar/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ar/strings.xml
rename to slice/core/src/main/res-public/values-ar/strings.xml
diff --git a/slices/core/src/main/res-public/values-as/strings.xml b/slice/core/src/main/res-public/values-as/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-as/strings.xml
rename to slice/core/src/main/res-public/values-as/strings.xml
diff --git a/slices/core/src/main/res-public/values-az/strings.xml b/slice/core/src/main/res-public/values-az/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-az/strings.xml
rename to slice/core/src/main/res-public/values-az/strings.xml
diff --git a/slices/core/src/main/res-public/values-b+sr+Latn/strings.xml b/slice/core/src/main/res-public/values-b+sr+Latn/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-b+sr+Latn/strings.xml
rename to slice/core/src/main/res-public/values-b+sr+Latn/strings.xml
diff --git a/slices/core/src/main/res-public/values-be/strings.xml b/slice/core/src/main/res-public/values-be/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-be/strings.xml
rename to slice/core/src/main/res-public/values-be/strings.xml
diff --git a/slices/core/src/main/res-public/values-bg/strings.xml b/slice/core/src/main/res-public/values-bg/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-bg/strings.xml
rename to slice/core/src/main/res-public/values-bg/strings.xml
diff --git a/slices/core/src/main/res-public/values-bn/strings.xml b/slice/core/src/main/res-public/values-bn/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-bn/strings.xml
rename to slice/core/src/main/res-public/values-bn/strings.xml
diff --git a/slices/core/src/main/res-public/values-bs/strings.xml b/slice/core/src/main/res-public/values-bs/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-bs/strings.xml
rename to slice/core/src/main/res-public/values-bs/strings.xml
diff --git a/slices/core/src/main/res-public/values-ca/strings.xml b/slice/core/src/main/res-public/values-ca/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ca/strings.xml
rename to slice/core/src/main/res-public/values-ca/strings.xml
diff --git a/slices/core/src/main/res-public/values-cs/strings.xml b/slice/core/src/main/res-public/values-cs/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-cs/strings.xml
rename to slice/core/src/main/res-public/values-cs/strings.xml
diff --git a/slices/core/src/main/res-public/values-da/strings.xml b/slice/core/src/main/res-public/values-da/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-da/strings.xml
rename to slice/core/src/main/res-public/values-da/strings.xml
diff --git a/slices/core/src/main/res-public/values-de/strings.xml b/slice/core/src/main/res-public/values-de/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-de/strings.xml
rename to slice/core/src/main/res-public/values-de/strings.xml
diff --git a/slices/core/src/main/res-public/values-el/strings.xml b/slice/core/src/main/res-public/values-el/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-el/strings.xml
rename to slice/core/src/main/res-public/values-el/strings.xml
diff --git a/slices/core/src/main/res-public/values-en-rAU/strings.xml b/slice/core/src/main/res-public/values-en-rAU/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-en-rAU/strings.xml
rename to slice/core/src/main/res-public/values-en-rAU/strings.xml
diff --git a/slices/core/src/main/res-public/values-en-rCA/strings.xml b/slice/core/src/main/res-public/values-en-rCA/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-en-rCA/strings.xml
rename to slice/core/src/main/res-public/values-en-rCA/strings.xml
diff --git a/slices/core/src/main/res-public/values-en-rGB/strings.xml b/slice/core/src/main/res-public/values-en-rGB/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-en-rGB/strings.xml
rename to slice/core/src/main/res-public/values-en-rGB/strings.xml
diff --git a/slices/core/src/main/res-public/values-en-rIN/strings.xml b/slice/core/src/main/res-public/values-en-rIN/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-en-rIN/strings.xml
rename to slice/core/src/main/res-public/values-en-rIN/strings.xml
diff --git a/slices/core/src/main/res-public/values-en-rXC/strings.xml b/slice/core/src/main/res-public/values-en-rXC/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-en-rXC/strings.xml
rename to slice/core/src/main/res-public/values-en-rXC/strings.xml
diff --git a/slices/core/src/main/res-public/values-es-rUS/strings.xml b/slice/core/src/main/res-public/values-es-rUS/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-es-rUS/strings.xml
rename to slice/core/src/main/res-public/values-es-rUS/strings.xml
diff --git a/slices/core/src/main/res-public/values-es/strings.xml b/slice/core/src/main/res-public/values-es/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-es/strings.xml
rename to slice/core/src/main/res-public/values-es/strings.xml
diff --git a/slices/core/src/main/res-public/values-et/strings.xml b/slice/core/src/main/res-public/values-et/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-et/strings.xml
rename to slice/core/src/main/res-public/values-et/strings.xml
diff --git a/slices/core/src/main/res-public/values-eu/strings.xml b/slice/core/src/main/res-public/values-eu/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-eu/strings.xml
rename to slice/core/src/main/res-public/values-eu/strings.xml
diff --git a/slices/core/src/main/res-public/values-fa/strings.xml b/slice/core/src/main/res-public/values-fa/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-fa/strings.xml
rename to slice/core/src/main/res-public/values-fa/strings.xml
diff --git a/slices/core/src/main/res-public/values-fi/strings.xml b/slice/core/src/main/res-public/values-fi/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-fi/strings.xml
rename to slice/core/src/main/res-public/values-fi/strings.xml
diff --git a/slices/core/src/main/res-public/values-fr-rCA/strings.xml b/slice/core/src/main/res-public/values-fr-rCA/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-fr-rCA/strings.xml
rename to slice/core/src/main/res-public/values-fr-rCA/strings.xml
diff --git a/slices/core/src/main/res-public/values-fr/strings.xml b/slice/core/src/main/res-public/values-fr/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-fr/strings.xml
rename to slice/core/src/main/res-public/values-fr/strings.xml
diff --git a/slices/core/src/main/res-public/values-gl/strings.xml b/slice/core/src/main/res-public/values-gl/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-gl/strings.xml
rename to slice/core/src/main/res-public/values-gl/strings.xml
diff --git a/slices/core/src/main/res-public/values-gu/strings.xml b/slice/core/src/main/res-public/values-gu/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-gu/strings.xml
rename to slice/core/src/main/res-public/values-gu/strings.xml
diff --git a/slices/core/src/main/res-public/values-hi/strings.xml b/slice/core/src/main/res-public/values-hi/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-hi/strings.xml
rename to slice/core/src/main/res-public/values-hi/strings.xml
diff --git a/slices/core/src/main/res-public/values-hr/strings.xml b/slice/core/src/main/res-public/values-hr/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-hr/strings.xml
rename to slice/core/src/main/res-public/values-hr/strings.xml
diff --git a/slices/core/src/main/res-public/values-hu/strings.xml b/slice/core/src/main/res-public/values-hu/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-hu/strings.xml
rename to slice/core/src/main/res-public/values-hu/strings.xml
diff --git a/slices/core/src/main/res-public/values-hy/strings.xml b/slice/core/src/main/res-public/values-hy/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-hy/strings.xml
rename to slice/core/src/main/res-public/values-hy/strings.xml
diff --git a/slices/core/src/main/res-public/values-in/strings.xml b/slice/core/src/main/res-public/values-in/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-in/strings.xml
rename to slice/core/src/main/res-public/values-in/strings.xml
diff --git a/slices/core/src/main/res-public/values-is/strings.xml b/slice/core/src/main/res-public/values-is/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-is/strings.xml
rename to slice/core/src/main/res-public/values-is/strings.xml
diff --git a/slices/core/src/main/res-public/values-it/strings.xml b/slice/core/src/main/res-public/values-it/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-it/strings.xml
rename to slice/core/src/main/res-public/values-it/strings.xml
diff --git a/slices/core/src/main/res-public/values-iw/strings.xml b/slice/core/src/main/res-public/values-iw/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-iw/strings.xml
rename to slice/core/src/main/res-public/values-iw/strings.xml
diff --git a/slices/core/src/main/res-public/values-ja/strings.xml b/slice/core/src/main/res-public/values-ja/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ja/strings.xml
rename to slice/core/src/main/res-public/values-ja/strings.xml
diff --git a/slices/core/src/main/res-public/values-ka/strings.xml b/slice/core/src/main/res-public/values-ka/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ka/strings.xml
rename to slice/core/src/main/res-public/values-ka/strings.xml
diff --git a/slices/core/src/main/res-public/values-kk/strings.xml b/slice/core/src/main/res-public/values-kk/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-kk/strings.xml
rename to slice/core/src/main/res-public/values-kk/strings.xml
diff --git a/slices/core/src/main/res-public/values-km/strings.xml b/slice/core/src/main/res-public/values-km/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-km/strings.xml
rename to slice/core/src/main/res-public/values-km/strings.xml
diff --git a/slices/core/src/main/res-public/values-kn/strings.xml b/slice/core/src/main/res-public/values-kn/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-kn/strings.xml
rename to slice/core/src/main/res-public/values-kn/strings.xml
diff --git a/slices/core/src/main/res-public/values-ko/strings.xml b/slice/core/src/main/res-public/values-ko/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ko/strings.xml
rename to slice/core/src/main/res-public/values-ko/strings.xml
diff --git a/slices/core/src/main/res-public/values-ky/strings.xml b/slice/core/src/main/res-public/values-ky/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ky/strings.xml
rename to slice/core/src/main/res-public/values-ky/strings.xml
diff --git a/slices/core/src/main/res-public/values-lo/strings.xml b/slice/core/src/main/res-public/values-lo/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-lo/strings.xml
rename to slice/core/src/main/res-public/values-lo/strings.xml
diff --git a/slices/core/src/main/res-public/values-lt/strings.xml b/slice/core/src/main/res-public/values-lt/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-lt/strings.xml
rename to slice/core/src/main/res-public/values-lt/strings.xml
diff --git a/slices/core/src/main/res-public/values-lv/strings.xml b/slice/core/src/main/res-public/values-lv/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-lv/strings.xml
rename to slice/core/src/main/res-public/values-lv/strings.xml
diff --git a/slices/core/src/main/res-public/values-mk/strings.xml b/slice/core/src/main/res-public/values-mk/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-mk/strings.xml
rename to slice/core/src/main/res-public/values-mk/strings.xml
diff --git a/slices/core/src/main/res-public/values-ml/strings.xml b/slice/core/src/main/res-public/values-ml/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ml/strings.xml
rename to slice/core/src/main/res-public/values-ml/strings.xml
diff --git a/slices/core/src/main/res-public/values-mn/strings.xml b/slice/core/src/main/res-public/values-mn/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-mn/strings.xml
rename to slice/core/src/main/res-public/values-mn/strings.xml
diff --git a/slices/core/src/main/res-public/values-mr/strings.xml b/slice/core/src/main/res-public/values-mr/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-mr/strings.xml
rename to slice/core/src/main/res-public/values-mr/strings.xml
diff --git a/slices/core/src/main/res-public/values-ms/strings.xml b/slice/core/src/main/res-public/values-ms/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ms/strings.xml
rename to slice/core/src/main/res-public/values-ms/strings.xml
diff --git a/slices/core/src/main/res-public/values-my/strings.xml b/slice/core/src/main/res-public/values-my/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-my/strings.xml
rename to slice/core/src/main/res-public/values-my/strings.xml
diff --git a/slices/core/src/main/res-public/values-nb/strings.xml b/slice/core/src/main/res-public/values-nb/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-nb/strings.xml
rename to slice/core/src/main/res-public/values-nb/strings.xml
diff --git a/slices/core/src/main/res-public/values-ne/strings.xml b/slice/core/src/main/res-public/values-ne/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ne/strings.xml
rename to slice/core/src/main/res-public/values-ne/strings.xml
diff --git a/slices/core/src/main/res-public/values-nl/strings.xml b/slice/core/src/main/res-public/values-nl/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-nl/strings.xml
rename to slice/core/src/main/res-public/values-nl/strings.xml
diff --git a/slices/core/src/main/res-public/values-or/strings.xml b/slice/core/src/main/res-public/values-or/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-or/strings.xml
rename to slice/core/src/main/res-public/values-or/strings.xml
diff --git a/slices/core/src/main/res-public/values-pa/strings.xml b/slice/core/src/main/res-public/values-pa/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-pa/strings.xml
rename to slice/core/src/main/res-public/values-pa/strings.xml
diff --git a/slices/core/src/main/res-public/values-pl/strings.xml b/slice/core/src/main/res-public/values-pl/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-pl/strings.xml
rename to slice/core/src/main/res-public/values-pl/strings.xml
diff --git a/slices/core/src/main/res-public/values-pt-rBR/strings.xml b/slice/core/src/main/res-public/values-pt-rBR/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-pt-rBR/strings.xml
rename to slice/core/src/main/res-public/values-pt-rBR/strings.xml
diff --git a/slices/core/src/main/res-public/values-pt-rPT/strings.xml b/slice/core/src/main/res-public/values-pt-rPT/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-pt-rPT/strings.xml
rename to slice/core/src/main/res-public/values-pt-rPT/strings.xml
diff --git a/slices/core/src/main/res-public/values-pt/strings.xml b/slice/core/src/main/res-public/values-pt/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-pt/strings.xml
rename to slice/core/src/main/res-public/values-pt/strings.xml
diff --git a/slices/core/src/main/res-public/values-ro/strings.xml b/slice/core/src/main/res-public/values-ro/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ro/strings.xml
rename to slice/core/src/main/res-public/values-ro/strings.xml
diff --git a/slices/core/src/main/res-public/values-ru/strings.xml b/slice/core/src/main/res-public/values-ru/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ru/strings.xml
rename to slice/core/src/main/res-public/values-ru/strings.xml
diff --git a/slices/core/src/main/res-public/values-si/strings.xml b/slice/core/src/main/res-public/values-si/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-si/strings.xml
rename to slice/core/src/main/res-public/values-si/strings.xml
diff --git a/slices/core/src/main/res-public/values-sk/strings.xml b/slice/core/src/main/res-public/values-sk/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-sk/strings.xml
rename to slice/core/src/main/res-public/values-sk/strings.xml
diff --git a/slices/core/src/main/res-public/values-sl/strings.xml b/slice/core/src/main/res-public/values-sl/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-sl/strings.xml
rename to slice/core/src/main/res-public/values-sl/strings.xml
diff --git a/slices/core/src/main/res-public/values-sq/strings.xml b/slice/core/src/main/res-public/values-sq/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-sq/strings.xml
rename to slice/core/src/main/res-public/values-sq/strings.xml
diff --git a/slices/core/src/main/res-public/values-sr/strings.xml b/slice/core/src/main/res-public/values-sr/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-sr/strings.xml
rename to slice/core/src/main/res-public/values-sr/strings.xml
diff --git a/slices/core/src/main/res-public/values-sv/strings.xml b/slice/core/src/main/res-public/values-sv/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-sv/strings.xml
rename to slice/core/src/main/res-public/values-sv/strings.xml
diff --git a/slices/core/src/main/res-public/values-sw/strings.xml b/slice/core/src/main/res-public/values-sw/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-sw/strings.xml
rename to slice/core/src/main/res-public/values-sw/strings.xml
diff --git a/slices/core/src/main/res-public/values-ta/strings.xml b/slice/core/src/main/res-public/values-ta/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ta/strings.xml
rename to slice/core/src/main/res-public/values-ta/strings.xml
diff --git a/slices/core/src/main/res-public/values-te/strings.xml b/slice/core/src/main/res-public/values-te/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-te/strings.xml
rename to slice/core/src/main/res-public/values-te/strings.xml
diff --git a/slices/core/src/main/res-public/values-th/strings.xml b/slice/core/src/main/res-public/values-th/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-th/strings.xml
rename to slice/core/src/main/res-public/values-th/strings.xml
diff --git a/slices/core/src/main/res-public/values-tl/strings.xml b/slice/core/src/main/res-public/values-tl/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-tl/strings.xml
rename to slice/core/src/main/res-public/values-tl/strings.xml
diff --git a/slices/core/src/main/res-public/values-tr/strings.xml b/slice/core/src/main/res-public/values-tr/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-tr/strings.xml
rename to slice/core/src/main/res-public/values-tr/strings.xml
diff --git a/slices/core/src/main/res-public/values-uk/strings.xml b/slice/core/src/main/res-public/values-uk/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-uk/strings.xml
rename to slice/core/src/main/res-public/values-uk/strings.xml
diff --git a/slices/core/src/main/res-public/values-ur/strings.xml b/slice/core/src/main/res-public/values-ur/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-ur/strings.xml
rename to slice/core/src/main/res-public/values-ur/strings.xml
diff --git a/slices/core/src/main/res-public/values-uz/strings.xml b/slice/core/src/main/res-public/values-uz/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-uz/strings.xml
rename to slice/core/src/main/res-public/values-uz/strings.xml
diff --git a/slices/core/src/main/res-public/values-v28/strings.xml b/slice/core/src/main/res-public/values-v28/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-v28/strings.xml
rename to slice/core/src/main/res-public/values-v28/strings.xml
diff --git a/slices/core/src/main/res-public/values-vi/strings.xml b/slice/core/src/main/res-public/values-vi/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-vi/strings.xml
rename to slice/core/src/main/res-public/values-vi/strings.xml
diff --git a/slices/core/src/main/res-public/values-zh-rCN/strings.xml b/slice/core/src/main/res-public/values-zh-rCN/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-zh-rCN/strings.xml
rename to slice/core/src/main/res-public/values-zh-rCN/strings.xml
diff --git a/slices/core/src/main/res-public/values-zh-rHK/strings.xml b/slice/core/src/main/res-public/values-zh-rHK/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-zh-rHK/strings.xml
rename to slice/core/src/main/res-public/values-zh-rHK/strings.xml
diff --git a/slices/core/src/main/res-public/values-zh-rTW/strings.xml b/slice/core/src/main/res-public/values-zh-rTW/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-zh-rTW/strings.xml
rename to slice/core/src/main/res-public/values-zh-rTW/strings.xml
diff --git a/slices/core/src/main/res-public/values-zu/strings.xml b/slice/core/src/main/res-public/values-zu/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values-zu/strings.xml
rename to slice/core/src/main/res-public/values-zu/strings.xml
diff --git a/slices/core/src/main/res-public/values/strings.xml b/slice/core/src/main/res-public/values/strings.xml
similarity index 100%
rename from slices/core/src/main/res-public/values/strings.xml
rename to slice/core/src/main/res-public/values/strings.xml
diff --git a/slices/core/src/main/res/drawable/abc_ic_arrow_forward.xml b/slice/core/src/main/res/drawable/abc_ic_arrow_forward.xml
similarity index 100%
rename from slices/core/src/main/res/drawable/abc_ic_arrow_forward.xml
rename to slice/core/src/main/res/drawable/abc_ic_arrow_forward.xml
diff --git a/slices/core/src/main/res/drawable/abc_ic_permission.xml b/slice/core/src/main/res/drawable/abc_ic_permission.xml
similarity index 100%
rename from slices/core/src/main/res/drawable/abc_ic_permission.xml
rename to slice/core/src/main/res/drawable/abc_ic_permission.xml
diff --git a/slices/core/src/main/res/layout/abc_slice_permission_request.xml b/slice/core/src/main/res/layout/abc_slice_permission_request.xml
similarity index 100%
rename from slices/core/src/main/res/layout/abc_slice_permission_request.xml
rename to slice/core/src/main/res/layout/abc_slice_permission_request.xml
diff --git a/slices/core/src/main/res/values-af/strings.xml b/slice/core/src/main/res/values-af/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-af/strings.xml
rename to slice/core/src/main/res/values-af/strings.xml
diff --git a/slices/core/src/main/res/values-am/strings.xml b/slice/core/src/main/res/values-am/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-am/strings.xml
rename to slice/core/src/main/res/values-am/strings.xml
diff --git a/slices/core/src/main/res/values-ar/strings.xml b/slice/core/src/main/res/values-ar/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ar/strings.xml
rename to slice/core/src/main/res/values-ar/strings.xml
diff --git a/slices/core/src/main/res/values-as/strings.xml b/slice/core/src/main/res/values-as/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-as/strings.xml
rename to slice/core/src/main/res/values-as/strings.xml
diff --git a/slices/core/src/main/res/values-az/strings.xml b/slice/core/src/main/res/values-az/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-az/strings.xml
rename to slice/core/src/main/res/values-az/strings.xml
diff --git a/slices/core/src/main/res/values-b+sr+Latn/strings.xml b/slice/core/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-b+sr+Latn/strings.xml
rename to slice/core/src/main/res/values-b+sr+Latn/strings.xml
diff --git a/slices/core/src/main/res/values-be/strings.xml b/slice/core/src/main/res/values-be/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-be/strings.xml
rename to slice/core/src/main/res/values-be/strings.xml
diff --git a/slices/core/src/main/res/values-bg/strings.xml b/slice/core/src/main/res/values-bg/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-bg/strings.xml
rename to slice/core/src/main/res/values-bg/strings.xml
diff --git a/slices/core/src/main/res/values-bn/strings.xml b/slice/core/src/main/res/values-bn/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-bn/strings.xml
rename to slice/core/src/main/res/values-bn/strings.xml
diff --git a/slices/core/src/main/res/values-bs/strings.xml b/slice/core/src/main/res/values-bs/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-bs/strings.xml
rename to slice/core/src/main/res/values-bs/strings.xml
diff --git a/slices/core/src/main/res/values-ca/strings.xml b/slice/core/src/main/res/values-ca/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ca/strings.xml
rename to slice/core/src/main/res/values-ca/strings.xml
diff --git a/slices/core/src/main/res/values-cs/strings.xml b/slice/core/src/main/res/values-cs/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-cs/strings.xml
rename to slice/core/src/main/res/values-cs/strings.xml
diff --git a/slices/core/src/main/res/values-da/strings.xml b/slice/core/src/main/res/values-da/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-da/strings.xml
rename to slice/core/src/main/res/values-da/strings.xml
diff --git a/slices/core/src/main/res/values-de/strings.xml b/slice/core/src/main/res/values-de/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-de/strings.xml
rename to slice/core/src/main/res/values-de/strings.xml
diff --git a/slices/core/src/main/res/values-el/strings.xml b/slice/core/src/main/res/values-el/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-el/strings.xml
rename to slice/core/src/main/res/values-el/strings.xml
diff --git a/slices/core/src/main/res/values-en-rAU/strings.xml b/slice/core/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-en-rAU/strings.xml
rename to slice/core/src/main/res/values-en-rAU/strings.xml
diff --git a/slices/core/src/main/res/values-en-rCA/strings.xml b/slice/core/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-en-rCA/strings.xml
rename to slice/core/src/main/res/values-en-rCA/strings.xml
diff --git a/slices/core/src/main/res/values-en-rGB/strings.xml b/slice/core/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-en-rGB/strings.xml
rename to slice/core/src/main/res/values-en-rGB/strings.xml
diff --git a/slices/core/src/main/res/values-en-rIN/strings.xml b/slice/core/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-en-rIN/strings.xml
rename to slice/core/src/main/res/values-en-rIN/strings.xml
diff --git a/slices/core/src/main/res/values-en-rXC/strings.xml b/slice/core/src/main/res/values-en-rXC/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-en-rXC/strings.xml
rename to slice/core/src/main/res/values-en-rXC/strings.xml
diff --git a/slices/core/src/main/res/values-es-rUS/strings.xml b/slice/core/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-es-rUS/strings.xml
rename to slice/core/src/main/res/values-es-rUS/strings.xml
diff --git a/slices/core/src/main/res/values-es/strings.xml b/slice/core/src/main/res/values-es/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-es/strings.xml
rename to slice/core/src/main/res/values-es/strings.xml
diff --git a/slices/core/src/main/res/values-et/strings.xml b/slice/core/src/main/res/values-et/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-et/strings.xml
rename to slice/core/src/main/res/values-et/strings.xml
diff --git a/slices/core/src/main/res/values-eu/strings.xml b/slice/core/src/main/res/values-eu/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-eu/strings.xml
rename to slice/core/src/main/res/values-eu/strings.xml
diff --git a/slices/core/src/main/res/values-fa/strings.xml b/slice/core/src/main/res/values-fa/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-fa/strings.xml
rename to slice/core/src/main/res/values-fa/strings.xml
diff --git a/slices/core/src/main/res/values-fi/strings.xml b/slice/core/src/main/res/values-fi/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-fi/strings.xml
rename to slice/core/src/main/res/values-fi/strings.xml
diff --git a/slices/core/src/main/res/values-fr-rCA/strings.xml b/slice/core/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-fr-rCA/strings.xml
rename to slice/core/src/main/res/values-fr-rCA/strings.xml
diff --git a/slices/core/src/main/res/values-fr/strings.xml b/slice/core/src/main/res/values-fr/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-fr/strings.xml
rename to slice/core/src/main/res/values-fr/strings.xml
diff --git a/slices/core/src/main/res/values-gl/strings.xml b/slice/core/src/main/res/values-gl/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-gl/strings.xml
rename to slice/core/src/main/res/values-gl/strings.xml
diff --git a/slices/core/src/main/res/values-gu/strings.xml b/slice/core/src/main/res/values-gu/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-gu/strings.xml
rename to slice/core/src/main/res/values-gu/strings.xml
diff --git a/slices/core/src/main/res/values-hi/strings.xml b/slice/core/src/main/res/values-hi/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-hi/strings.xml
rename to slice/core/src/main/res/values-hi/strings.xml
diff --git a/slices/core/src/main/res/values-hr/strings.xml b/slice/core/src/main/res/values-hr/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-hr/strings.xml
rename to slice/core/src/main/res/values-hr/strings.xml
diff --git a/slices/core/src/main/res/values-hu/strings.xml b/slice/core/src/main/res/values-hu/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-hu/strings.xml
rename to slice/core/src/main/res/values-hu/strings.xml
diff --git a/slices/core/src/main/res/values-hy/strings.xml b/slice/core/src/main/res/values-hy/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-hy/strings.xml
rename to slice/core/src/main/res/values-hy/strings.xml
diff --git a/slices/core/src/main/res/values-in/strings.xml b/slice/core/src/main/res/values-in/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-in/strings.xml
rename to slice/core/src/main/res/values-in/strings.xml
diff --git a/slices/core/src/main/res/values-is/strings.xml b/slice/core/src/main/res/values-is/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-is/strings.xml
rename to slice/core/src/main/res/values-is/strings.xml
diff --git a/slices/core/src/main/res/values-it/strings.xml b/slice/core/src/main/res/values-it/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-it/strings.xml
rename to slice/core/src/main/res/values-it/strings.xml
diff --git a/slices/core/src/main/res/values-iw/strings.xml b/slice/core/src/main/res/values-iw/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-iw/strings.xml
rename to slice/core/src/main/res/values-iw/strings.xml
diff --git a/slices/core/src/main/res/values-ja/strings.xml b/slice/core/src/main/res/values-ja/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ja/strings.xml
rename to slice/core/src/main/res/values-ja/strings.xml
diff --git a/slices/core/src/main/res/values-ka/strings.xml b/slice/core/src/main/res/values-ka/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ka/strings.xml
rename to slice/core/src/main/res/values-ka/strings.xml
diff --git a/slices/core/src/main/res/values-kk/strings.xml b/slice/core/src/main/res/values-kk/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-kk/strings.xml
rename to slice/core/src/main/res/values-kk/strings.xml
diff --git a/slices/core/src/main/res/values-km/strings.xml b/slice/core/src/main/res/values-km/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-km/strings.xml
rename to slice/core/src/main/res/values-km/strings.xml
diff --git a/slices/core/src/main/res/values-kn/strings.xml b/slice/core/src/main/res/values-kn/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-kn/strings.xml
rename to slice/core/src/main/res/values-kn/strings.xml
diff --git a/slices/core/src/main/res/values-ko/strings.xml b/slice/core/src/main/res/values-ko/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ko/strings.xml
rename to slice/core/src/main/res/values-ko/strings.xml
diff --git a/slices/core/src/main/res/values-ky/strings.xml b/slice/core/src/main/res/values-ky/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ky/strings.xml
rename to slice/core/src/main/res/values-ky/strings.xml
diff --git a/slices/core/src/main/res/values-lo/strings.xml b/slice/core/src/main/res/values-lo/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-lo/strings.xml
rename to slice/core/src/main/res/values-lo/strings.xml
diff --git a/slices/core/src/main/res/values-lt/strings.xml b/slice/core/src/main/res/values-lt/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-lt/strings.xml
rename to slice/core/src/main/res/values-lt/strings.xml
diff --git a/slices/core/src/main/res/values-lv/strings.xml b/slice/core/src/main/res/values-lv/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-lv/strings.xml
rename to slice/core/src/main/res/values-lv/strings.xml
diff --git a/slices/core/src/main/res/values-mk/strings.xml b/slice/core/src/main/res/values-mk/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-mk/strings.xml
rename to slice/core/src/main/res/values-mk/strings.xml
diff --git a/slices/core/src/main/res/values-ml/strings.xml b/slice/core/src/main/res/values-ml/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ml/strings.xml
rename to slice/core/src/main/res/values-ml/strings.xml
diff --git a/slices/core/src/main/res/values-mn/strings.xml b/slice/core/src/main/res/values-mn/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-mn/strings.xml
rename to slice/core/src/main/res/values-mn/strings.xml
diff --git a/slices/core/src/main/res/values-mr/strings.xml b/slice/core/src/main/res/values-mr/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-mr/strings.xml
rename to slice/core/src/main/res/values-mr/strings.xml
diff --git a/slices/core/src/main/res/values-ms/strings.xml b/slice/core/src/main/res/values-ms/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ms/strings.xml
rename to slice/core/src/main/res/values-ms/strings.xml
diff --git a/slices/core/src/main/res/values-my/strings.xml b/slice/core/src/main/res/values-my/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-my/strings.xml
rename to slice/core/src/main/res/values-my/strings.xml
diff --git a/slices/core/src/main/res/values-nb/strings.xml b/slice/core/src/main/res/values-nb/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-nb/strings.xml
rename to slice/core/src/main/res/values-nb/strings.xml
diff --git a/slices/core/src/main/res/values-ne/strings.xml b/slice/core/src/main/res/values-ne/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ne/strings.xml
rename to slice/core/src/main/res/values-ne/strings.xml
diff --git a/slices/core/src/main/res/values-nl/strings.xml b/slice/core/src/main/res/values-nl/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-nl/strings.xml
rename to slice/core/src/main/res/values-nl/strings.xml
diff --git a/slices/core/src/main/res/values-or/strings.xml b/slice/core/src/main/res/values-or/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-or/strings.xml
rename to slice/core/src/main/res/values-or/strings.xml
diff --git a/slices/core/src/main/res/values-pa/strings.xml b/slice/core/src/main/res/values-pa/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-pa/strings.xml
rename to slice/core/src/main/res/values-pa/strings.xml
diff --git a/slices/core/src/main/res/values-pl/strings.xml b/slice/core/src/main/res/values-pl/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-pl/strings.xml
rename to slice/core/src/main/res/values-pl/strings.xml
diff --git a/slices/core/src/main/res/values-pt-rBR/strings.xml b/slice/core/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-pt-rBR/strings.xml
rename to slice/core/src/main/res/values-pt-rBR/strings.xml
diff --git a/slices/core/src/main/res/values-pt-rPT/strings.xml b/slice/core/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-pt-rPT/strings.xml
rename to slice/core/src/main/res/values-pt-rPT/strings.xml
diff --git a/slices/core/src/main/res/values-pt/strings.xml b/slice/core/src/main/res/values-pt/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-pt/strings.xml
rename to slice/core/src/main/res/values-pt/strings.xml
diff --git a/slices/core/src/main/res/values-ro/strings.xml b/slice/core/src/main/res/values-ro/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ro/strings.xml
rename to slice/core/src/main/res/values-ro/strings.xml
diff --git a/slices/core/src/main/res/values-ru/strings.xml b/slice/core/src/main/res/values-ru/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ru/strings.xml
rename to slice/core/src/main/res/values-ru/strings.xml
diff --git a/slices/core/src/main/res/values-si/strings.xml b/slice/core/src/main/res/values-si/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-si/strings.xml
rename to slice/core/src/main/res/values-si/strings.xml
diff --git a/slices/core/src/main/res/values-sk/strings.xml b/slice/core/src/main/res/values-sk/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-sk/strings.xml
rename to slice/core/src/main/res/values-sk/strings.xml
diff --git a/slices/core/src/main/res/values-sl/strings.xml b/slice/core/src/main/res/values-sl/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-sl/strings.xml
rename to slice/core/src/main/res/values-sl/strings.xml
diff --git a/slices/core/src/main/res/values-sq/strings.xml b/slice/core/src/main/res/values-sq/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-sq/strings.xml
rename to slice/core/src/main/res/values-sq/strings.xml
diff --git a/slices/core/src/main/res/values-sr/strings.xml b/slice/core/src/main/res/values-sr/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-sr/strings.xml
rename to slice/core/src/main/res/values-sr/strings.xml
diff --git a/slices/core/src/main/res/values-sv/strings.xml b/slice/core/src/main/res/values-sv/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-sv/strings.xml
rename to slice/core/src/main/res/values-sv/strings.xml
diff --git a/slices/core/src/main/res/values-sw/strings.xml b/slice/core/src/main/res/values-sw/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-sw/strings.xml
rename to slice/core/src/main/res/values-sw/strings.xml
diff --git a/slices/core/src/main/res/values-ta/strings.xml b/slice/core/src/main/res/values-ta/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ta/strings.xml
rename to slice/core/src/main/res/values-ta/strings.xml
diff --git a/slices/core/src/main/res/values-te/strings.xml b/slice/core/src/main/res/values-te/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-te/strings.xml
rename to slice/core/src/main/res/values-te/strings.xml
diff --git a/slices/core/src/main/res/values-th/strings.xml b/slice/core/src/main/res/values-th/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-th/strings.xml
rename to slice/core/src/main/res/values-th/strings.xml
diff --git a/slices/core/src/main/res/values-tl/strings.xml b/slice/core/src/main/res/values-tl/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-tl/strings.xml
rename to slice/core/src/main/res/values-tl/strings.xml
diff --git a/slices/core/src/main/res/values-tr/strings.xml b/slice/core/src/main/res/values-tr/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-tr/strings.xml
rename to slice/core/src/main/res/values-tr/strings.xml
diff --git a/slices/core/src/main/res/values-uk/strings.xml b/slice/core/src/main/res/values-uk/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-uk/strings.xml
rename to slice/core/src/main/res/values-uk/strings.xml
diff --git a/slices/core/src/main/res/values-ur/strings.xml b/slice/core/src/main/res/values-ur/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-ur/strings.xml
rename to slice/core/src/main/res/values-ur/strings.xml
diff --git a/slices/core/src/main/res/values-uz/strings.xml b/slice/core/src/main/res/values-uz/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-uz/strings.xml
rename to slice/core/src/main/res/values-uz/strings.xml
diff --git a/slices/core/src/main/res/values-vi/strings.xml b/slice/core/src/main/res/values-vi/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-vi/strings.xml
rename to slice/core/src/main/res/values-vi/strings.xml
diff --git a/slices/core/src/main/res/values-zh-rCN/strings.xml b/slice/core/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-zh-rCN/strings.xml
rename to slice/core/src/main/res/values-zh-rCN/strings.xml
diff --git a/slices/core/src/main/res/values-zh-rHK/strings.xml b/slice/core/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-zh-rHK/strings.xml
rename to slice/core/src/main/res/values-zh-rHK/strings.xml
diff --git a/slices/core/src/main/res/values-zh-rTW/strings.xml b/slice/core/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-zh-rTW/strings.xml
rename to slice/core/src/main/res/values-zh-rTW/strings.xml
diff --git a/slices/core/src/main/res/values-zu/strings.xml b/slice/core/src/main/res/values-zu/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values-zu/strings.xml
rename to slice/core/src/main/res/values-zu/strings.xml
diff --git a/slices/core/src/main/res/values/strings.xml b/slice/core/src/main/res/values/strings.xml
similarity index 100%
rename from slices/core/src/main/res/values/strings.xml
rename to slice/core/src/main/res/values/strings.xml
diff --git a/slices/remotecallback/api/current.txt b/slice/remotecallback/api/current.txt
similarity index 100%
rename from slices/remotecallback/api/current.txt
rename to slice/remotecallback/api/current.txt
diff --git a/slices/remotecallback/api/public_plus_experimental_current.txt b/slice/remotecallback/api/public_plus_experimental_current.txt
similarity index 100%
rename from slices/remotecallback/api/public_plus_experimental_current.txt
rename to slice/remotecallback/api/public_plus_experimental_current.txt
diff --git a/slices/remotecallback/api/res-current.txt b/slice/remotecallback/api/res-current.txt
similarity index 100%
rename from slices/remotecallback/api/res-current.txt
rename to slice/remotecallback/api/res-current.txt
diff --git a/slices/remotecallback/api/restricted_current.txt b/slice/remotecallback/api/restricted_current.txt
similarity index 100%
rename from slices/remotecallback/api/restricted_current.txt
rename to slice/remotecallback/api/restricted_current.txt
diff --git a/slices/remotecallback/build.gradle b/slice/remotecallback/build.gradle
similarity index 96%
rename from slices/remotecallback/build.gradle
rename to slice/remotecallback/build.gradle
index 2a4a76b..c584a24 100644
--- a/slices/remotecallback/build.gradle
+++ b/slice/remotecallback/build.gradle
@@ -26,7 +26,7 @@
dependencies {
implementation("androidx.appcompat:appcompat:1.1.0")
- implementation(project(":slice-core"))
+ implementation(project(":slice:slice-core"))
implementation(project(":remotecallback:remotecallback"))
androidTestImplementation(libs.testExtJunit)
diff --git a/slices/remotecallback/src/androidTest/AndroidManifest.xml b/slice/remotecallback/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slices/remotecallback/src/androidTest/AndroidManifest.xml
rename to slice/remotecallback/src/androidTest/AndroidManifest.xml
diff --git a/slices/remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java b/slice/remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java
similarity index 100%
rename from slices/remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java
rename to slice/remotecallback/src/androidTest/java/androidx/slice/remotecallback/RemoteSliceProviderTest.java
diff --git a/slices/remotecallback/src/main/AndroidManifest.xml b/slice/remotecallback/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/remotecallback/src/main/AndroidManifest.xml
rename to slice/remotecallback/src/main/AndroidManifest.xml
diff --git a/slices/remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java b/slice/remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java
similarity index 100%
rename from slices/remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java
rename to slice/remotecallback/src/main/java/androidx/slice/remotecallback/RemoteSliceProvider.java
diff --git a/slices/test/build.gradle b/slice/test/build.gradle
similarity index 93%
rename from slices/test/build.gradle
rename to slice/test/build.gradle
index 380f058..901074e 100644
--- a/slices/test/build.gradle
+++ b/slice/test/build.gradle
@@ -24,8 +24,8 @@
}
dependencies {
- implementation(project(":slice-core"))
- implementation(project(":slice-builders"))
+ implementation(project(":slice:slice-core"))
+ implementation(project(":slice:slice-builders"))
implementation(project(":recyclerview:recyclerview"))
implementation("androidx.collection:collection:1.1.0")
api("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
diff --git a/slices/test/lint-baseline.xml b/slice/test/lint-baseline.xml
similarity index 100%
rename from slices/test/lint-baseline.xml
rename to slice/test/lint-baseline.xml
diff --git a/slices/test/src/main/AndroidManifest.xml b/slice/test/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/test/src/main/AndroidManifest.xml
rename to slice/test/src/main/AndroidManifest.xml
diff --git a/slices/test/src/main/java/androidx/slice/test/SampleSliceProvider.java b/slice/test/src/main/java/androidx/slice/test/SampleSliceProvider.java
similarity index 100%
rename from slices/test/src/main/java/androidx/slice/test/SampleSliceProvider.java
rename to slice/test/src/main/java/androidx/slice/test/SampleSliceProvider.java
diff --git a/slices/test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java b/slice/test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java
similarity index 100%
rename from slices/test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java
rename to slice/test/src/main/java/androidx/slice/test/SliceBroadcastReceiver.java
diff --git a/slices/test/src/main/res/drawable/cake.png b/slice/test/src/main/res/drawable/cake.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cake.png
rename to slice/test/src/main/res/drawable/cake.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat.jpeg b/slice/test/src/main/res/drawable/cat.jpeg
similarity index 100%
rename from slices/test/src/main/res/drawable/cat.jpeg
rename to slice/test/src/main/res/drawable/cat.jpeg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat_1.png b/slice/test/src/main/res/drawable/cat_1.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cat_1.png
rename to slice/test/src/main/res/drawable/cat_1.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat_2.png b/slice/test/src/main/res/drawable/cat_2.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cat_2.png
rename to slice/test/src/main/res/drawable/cat_2.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat_3.png b/slice/test/src/main/res/drawable/cat_3.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cat_3.png
rename to slice/test/src/main/res/drawable/cat_3.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat_4.png b/slice/test/src/main/res/drawable/cat_4.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cat_4.png
rename to slice/test/src/main/res/drawable/cat_4.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat_5.png b/slice/test/src/main/res/drawable/cat_5.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cat_5.png
rename to slice/test/src/main/res/drawable/cat_5.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cat_6.png b/slice/test/src/main/res/drawable/cat_6.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cat_6.png
rename to slice/test/src/main/res/drawable/cat_6.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/cheese.png b/slice/test/src/main/res/drawable/cheese.png
similarity index 100%
rename from slices/test/src/main/res/drawable/cheese.png
rename to slice/test/src/main/res/drawable/cheese.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/ic_call.xml b/slice/test/src/main/res/drawable/ic_call.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_call.xml
rename to slice/test/src/main/res/drawable/ic_call.xml
diff --git a/slices/test/src/main/res/drawable/ic_camera.xml b/slice/test/src/main/res/drawable/ic_camera.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_camera.xml
rename to slice/test/src/main/res/drawable/ic_camera.xml
diff --git a/slices/test/src/main/res/drawable/ic_car.xml b/slice/test/src/main/res/drawable/ic_car.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_car.xml
rename to slice/test/src/main/res/drawable/ic_car.xml
diff --git a/slices/test/src/main/res/drawable/ic_cast.xml b/slice/test/src/main/res/drawable/ic_cast.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_cast.xml
rename to slice/test/src/main/res/drawable/ic_cast.xml
diff --git a/slices/test/src/main/res/drawable/ic_check.xml b/slice/test/src/main/res/drawable/ic_check.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_check.xml
rename to slice/test/src/main/res/drawable/ic_check.xml
diff --git a/slices/test/src/main/res/drawable/ic_create.xml b/slice/test/src/main/res/drawable/ic_create.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_create.xml
rename to slice/test/src/main/res/drawable/ic_create.xml
diff --git a/slices/test/src/main/res/drawable/ic_email.xml b/slice/test/src/main/res/drawable/ic_email.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_email.xml
rename to slice/test/src/main/res/drawable/ic_email.xml
diff --git a/slices/test/src/main/res/drawable/ic_error.xml b/slice/test/src/main/res/drawable/ic_error.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_error.xml
rename to slice/test/src/main/res/drawable/ic_error.xml
diff --git a/slices/test/src/main/res/drawable/ic_home.xml b/slice/test/src/main/res/drawable/ic_home.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_home.xml
rename to slice/test/src/main/res/drawable/ic_home.xml
diff --git a/slices/test/src/main/res/drawable/ic_large.xml b/slice/test/src/main/res/drawable/ic_large.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_large.xml
rename to slice/test/src/main/res/drawable/ic_large.xml
diff --git a/slices/test/src/main/res/drawable/ic_location.xml b/slice/test/src/main/res/drawable/ic_location.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_location.xml
rename to slice/test/src/main/res/drawable/ic_location.xml
diff --git a/slices/test/src/main/res/drawable/ic_lock.xml b/slice/test/src/main/res/drawable/ic_lock.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_lock.xml
rename to slice/test/src/main/res/drawable/ic_lock.xml
diff --git a/slices/test/src/main/res/drawable/ic_more.xml b/slice/test/src/main/res/drawable/ic_more.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_more.xml
rename to slice/test/src/main/res/drawable/ic_more.xml
diff --git a/slices/test/src/main/res/drawable/ic_note.xml b/slice/test/src/main/res/drawable/ic_note.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_note.xml
rename to slice/test/src/main/res/drawable/ic_note.xml
diff --git a/slices/test/src/main/res/drawable/ic_right_caret.xml b/slice/test/src/main/res/drawable/ic_right_caret.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_right_caret.xml
rename to slice/test/src/main/res/drawable/ic_right_caret.xml
diff --git a/slices/test/src/main/res/drawable/ic_school.xml b/slice/test/src/main/res/drawable/ic_school.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_school.xml
rename to slice/test/src/main/res/drawable/ic_school.xml
diff --git a/slices/test/src/main/res/drawable/ic_share.xml b/slice/test/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_share.xml
rename to slice/test/src/main/res/drawable/ic_share.xml
diff --git a/slices/test/src/main/res/drawable/ic_shortcut.xml b/slice/test/src/main/res/drawable/ic_shortcut.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_shortcut.xml
rename to slice/test/src/main/res/drawable/ic_shortcut.xml
diff --git a/slices/test/src/main/res/drawable/ic_small.xml b/slice/test/src/main/res/drawable/ic_small.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_small.xml
rename to slice/test/src/main/res/drawable/ic_small.xml
diff --git a/slices/test/src/main/res/drawable/ic_speak.xml b/slice/test/src/main/res/drawable/ic_speak.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_speak.xml
rename to slice/test/src/main/res/drawable/ic_speak.xml
diff --git a/slices/test/src/main/res/drawable/ic_star_off.xml b/slice/test/src/main/res/drawable/ic_star_off.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_star_off.xml
rename to slice/test/src/main/res/drawable/ic_star_off.xml
diff --git a/slices/test/src/main/res/drawable/ic_star_on.xml b/slice/test/src/main/res/drawable/ic_star_on.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_star_on.xml
rename to slice/test/src/main/res/drawable/ic_star_on.xml
diff --git a/slices/test/src/main/res/drawable/ic_text.xml b/slice/test/src/main/res/drawable/ic_text.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_text.xml
rename to slice/test/src/main/res/drawable/ic_text.xml
diff --git a/slices/test/src/main/res/drawable/ic_unchecked.xml b/slice/test/src/main/res/drawable/ic_unchecked.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_unchecked.xml
rename to slice/test/src/main/res/drawable/ic_unchecked.xml
diff --git a/slices/test/src/main/res/drawable/ic_video.xml b/slice/test/src/main/res/drawable/ic_video.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_video.xml
rename to slice/test/src/main/res/drawable/ic_video.xml
diff --git a/slices/test/src/main/res/drawable/ic_voice.xml b/slice/test/src/main/res/drawable/ic_voice.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_voice.xml
rename to slice/test/src/main/res/drawable/ic_voice.xml
diff --git a/slices/test/src/main/res/drawable/ic_wifi.xml b/slice/test/src/main/res/drawable/ic_wifi.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_wifi.xml
rename to slice/test/src/main/res/drawable/ic_wifi.xml
diff --git a/slices/test/src/main/res/drawable/ic_wifi_fair.xml b/slice/test/src/main/res/drawable/ic_wifi_fair.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_wifi_fair.xml
rename to slice/test/src/main/res/drawable/ic_wifi_fair.xml
diff --git a/slices/test/src/main/res/drawable/ic_wifi_full.xml b/slice/test/src/main/res/drawable/ic_wifi_full.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_wifi_full.xml
rename to slice/test/src/main/res/drawable/ic_wifi_full.xml
diff --git a/slices/test/src/main/res/drawable/ic_wifi_low.xml b/slice/test/src/main/res/drawable/ic_wifi_low.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_wifi_low.xml
rename to slice/test/src/main/res/drawable/ic_wifi_low.xml
diff --git a/slices/test/src/main/res/drawable/ic_work.xml b/slice/test/src/main/res/drawable/ic_work.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/ic_work.xml
rename to slice/test/src/main/res/drawable/ic_work.xml
diff --git a/slices/test/src/main/res/drawable/landscape.jpg b/slice/test/src/main/res/drawable/landscape.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/landscape.jpg
rename to slice/test/src/main/res/drawable/landscape.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/mady.jpg b/slice/test/src/main/res/drawable/mady.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/mady.jpg
rename to slice/test/src/main/res/drawable/mady.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/message.png b/slice/test/src/main/res/drawable/message.png
similarity index 100%
rename from slices/test/src/main/res/drawable/message.png
rename to slice/test/src/main/res/drawable/message.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/pizza.png b/slice/test/src/main/res/drawable/pizza.png
similarity index 100%
rename from slices/test/src/main/res/drawable/pizza.png
rename to slice/test/src/main/res/drawable/pizza.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/pizza1.jpeg b/slice/test/src/main/res/drawable/pizza1.jpeg
similarity index 100%
rename from slices/test/src/main/res/drawable/pizza1.jpeg
rename to slice/test/src/main/res/drawable/pizza1.jpeg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/pizza2.jpg b/slice/test/src/main/res/drawable/pizza2.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/pizza2.jpg
rename to slice/test/src/main/res/drawable/pizza2.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/pizza3.jpeg b/slice/test/src/main/res/drawable/pizza3.jpeg
similarity index 100%
rename from slices/test/src/main/res/drawable/pizza3.jpeg
rename to slice/test/src/main/res/drawable/pizza3.jpeg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/pizza4.jpeg b/slice/test/src/main/res/drawable/pizza4.jpeg
similarity index 100%
rename from slices/test/src/main/res/drawable/pizza4.jpeg
rename to slice/test/src/main/res/drawable/pizza4.jpeg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/portrait.jpg b/slice/test/src/main/res/drawable/portrait.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/portrait.jpg
rename to slice/test/src/main/res/drawable/portrait.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/reservation.png b/slice/test/src/main/res/drawable/reservation.png
similarity index 100%
rename from slices/test/src/main/res/drawable/reservation.png
rename to slice/test/src/main/res/drawable/reservation.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/slices_1.jpg b/slice/test/src/main/res/drawable/slices_1.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/slices_1.jpg
rename to slice/test/src/main/res/drawable/slices_1.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/slices_2.jpg b/slice/test/src/main/res/drawable/slices_2.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/slices_2.jpg
rename to slice/test/src/main/res/drawable/slices_2.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/slices_3.jpg b/slice/test/src/main/res/drawable/slices_3.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/slices_3.jpg
rename to slice/test/src/main/res/drawable/slices_3.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/slices_4.jpg b/slice/test/src/main/res/drawable/slices_4.jpg
similarity index 100%
rename from slices/test/src/main/res/drawable/slices_4.jpg
rename to slice/test/src/main/res/drawable/slices_4.jpg
Binary files differ
diff --git a/slices/test/src/main/res/drawable/toggle_check.xml b/slice/test/src/main/res/drawable/toggle_check.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/toggle_check.xml
rename to slice/test/src/main/res/drawable/toggle_check.xml
diff --git a/slices/test/src/main/res/drawable/toggle_star.xml b/slice/test/src/main/res/drawable/toggle_star.xml
similarity index 100%
rename from slices/test/src/main/res/drawable/toggle_star.xml
rename to slice/test/src/main/res/drawable/toggle_star.xml
diff --git a/slices/test/src/main/res/drawable/weather_1.png b/slice/test/src/main/res/drawable/weather_1.png
similarity index 100%
rename from slices/test/src/main/res/drawable/weather_1.png
rename to slice/test/src/main/res/drawable/weather_1.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/weather_2.png b/slice/test/src/main/res/drawable/weather_2.png
similarity index 100%
rename from slices/test/src/main/res/drawable/weather_2.png
rename to slice/test/src/main/res/drawable/weather_2.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/weather_3.png b/slice/test/src/main/res/drawable/weather_3.png
similarity index 100%
rename from slices/test/src/main/res/drawable/weather_3.png
rename to slice/test/src/main/res/drawable/weather_3.png
Binary files differ
diff --git a/slices/test/src/main/res/drawable/weather_4.png b/slice/test/src/main/res/drawable/weather_4.png
similarity index 100%
rename from slices/test/src/main/res/drawable/weather_4.png
rename to slice/test/src/main/res/drawable/weather_4.png
Binary files differ
diff --git a/slices/view/api/api_lint.ignore b/slice/view/api/api_lint.ignore
similarity index 100%
rename from slices/view/api/api_lint.ignore
rename to slice/view/api/api_lint.ignore
diff --git a/slices/view/api/current.txt b/slice/view/api/current.txt
similarity index 100%
rename from slices/view/api/current.txt
rename to slice/view/api/current.txt
diff --git a/slices/view/api/public_plus_experimental_1.0.0.txt b/slice/view/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from slices/view/api/public_plus_experimental_1.0.0.txt
rename to slice/view/api/public_plus_experimental_1.0.0.txt
diff --git a/slices/view/api/public_plus_experimental_current.txt b/slice/view/api/public_plus_experimental_current.txt
similarity index 100%
rename from slices/view/api/public_plus_experimental_current.txt
rename to slice/view/api/public_plus_experimental_current.txt
diff --git a/slices/view/api/removed_current.txt b/slice/view/api/removed_current.txt
similarity index 100%
rename from slices/view/api/removed_current.txt
rename to slice/view/api/removed_current.txt
diff --git a/slices/view/api/res-current.txt b/slice/view/api/res-current.txt
similarity index 100%
rename from slices/view/api/res-current.txt
rename to slice/view/api/res-current.txt
diff --git a/slices/view/api/restricted_1.0.0.txt b/slice/view/api/restricted_1.0.0.txt
similarity index 100%
rename from slices/view/api/restricted_1.0.0.txt
rename to slice/view/api/restricted_1.0.0.txt
diff --git a/slices/view/api/restricted_current.txt b/slice/view/api/restricted_current.txt
similarity index 100%
rename from slices/view/api/restricted_current.txt
rename to slice/view/api/restricted_current.txt
diff --git a/slices/view/api_legacy/current.txt b/slice/view/api_legacy/current.txt
similarity index 100%
rename from slices/view/api_legacy/current.txt
rename to slice/view/api_legacy/current.txt
diff --git a/slices/view/build.gradle b/slice/view/build.gradle
similarity index 90%
rename from slices/view/build.gradle
rename to slice/view/build.gradle
index daa639d..c0826bb 100644
--- a/slices/view/build.gradle
+++ b/slice/view/build.gradle
@@ -24,14 +24,14 @@
}
dependencies {
- implementation(project(":slice-core"))
+ implementation(project(":slice:slice-core"))
implementation(project(":appcompat:appcompat"))
implementation("androidx.recyclerview:recyclerview:1.2.0-beta01")
implementation("androidx.collection:collection:1.1.0")
api("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
- androidTestImplementation(project(":slice-builders"))
- androidTestImplementation(project(":slice-test"))
+ androidTestImplementation(project(":slice:slice-builders"))
+ androidTestImplementation(project(":slice:slice-test"))
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
diff --git a/slices/view/lint-baseline.xml b/slice/view/lint-baseline.xml
similarity index 100%
rename from slices/view/lint-baseline.xml
rename to slice/view/lint-baseline.xml
diff --git a/slices/view/src/androidTest/AndroidManifest.xml b/slice/view/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from slices/view/src/androidTest/AndroidManifest.xml
rename to slice/view/src/androidTest/AndroidManifest.xml
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java b/slice/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
rename to slice/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java b/slice/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
rename to slice/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java b/slice/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
rename to slice/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java b/slice/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
rename to slice/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java b/slice/view/src/androidTest/java/androidx/slice/render/RenderTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
rename to slice/view/src/androidTest/java/androidx/slice/render/RenderTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java b/slice/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
rename to slice/view/src/androidTest/java/androidx/slice/render/SliceRenderActivity.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java b/slice/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
rename to slice/view/src/androidTest/java/androidx/slice/render/SliceRenderer.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java b/slice/view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java
rename to slice/view/src/androidTest/java/androidx/slice/widget/CachedSliceLiveDataTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java b/slice/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
rename to slice/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java b/slice/view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java
rename to slice/view/src/androidTest/java/androidx/slice/widget/SliceStyleTest.java
diff --git a/slices/view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java b/slice/view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java
similarity index 100%
rename from slices/view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java
rename to slice/view/src/androidTest/java/androidx/slice/widget/SliceViewTest.java
diff --git a/slices/view/src/androidTest/res/layout/activity_demo.xml b/slice/view/src/androidTest/res/layout/activity_demo.xml
similarity index 100%
rename from slices/view/src/androidTest/res/layout/activity_demo.xml
rename to slice/view/src/androidTest/res/layout/activity_demo.xml
diff --git a/slices/view/src/androidTest/res/layout/hide_header_row_slice_view.xml b/slice/view/src/androidTest/res/layout/hide_header_row_slice_view.xml
similarity index 100%
rename from slices/view/src/androidTest/res/layout/hide_header_row_slice_view.xml
rename to slice/view/src/androidTest/res/layout/hide_header_row_slice_view.xml
diff --git a/slices/view/src/androidTest/res/layout/render_layout.xml b/slice/view/src/androidTest/res/layout/render_layout.xml
similarity index 100%
rename from slices/view/src/androidTest/res/layout/render_layout.xml
rename to slice/view/src/androidTest/res/layout/render_layout.xml
diff --git a/slices/view/src/androidTest/res/values/colors.xml b/slice/view/src/androidTest/res/values/colors.xml
similarity index 100%
rename from slices/view/src/androidTest/res/values/colors.xml
rename to slice/view/src/androidTest/res/values/colors.xml
diff --git a/slices/view/src/androidTest/res/values/donottranslate-strings.xml b/slice/view/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from slices/view/src/androidTest/res/values/donottranslate-strings.xml
rename to slice/view/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/slices/view/src/androidTest/res/values/slice_style_test_colors.xml b/slice/view/src/androidTest/res/values/slice_style_test_colors.xml
similarity index 100%
rename from slices/view/src/androidTest/res/values/slice_style_test_colors.xml
rename to slice/view/src/androidTest/res/values/slice_style_test_colors.xml
diff --git a/slices/view/src/androidTest/res/values/slice_style_test_styles.xml b/slice/view/src/androidTest/res/values/slice_style_test_styles.xml
similarity index 100%
rename from slices/view/src/androidTest/res/values/slice_style_test_styles.xml
rename to slice/view/src/androidTest/res/values/slice_style_test_styles.xml
diff --git a/slices/view/src/androidTest/res/values/styles.xml b/slice/view/src/androidTest/res/values/styles.xml
similarity index 100%
rename from slices/view/src/androidTest/res/values/styles.xml
rename to slice/view/src/androidTest/res/values/styles.xml
diff --git a/slices/view/src/androidTest/res/xml/slice_style_test.xml b/slice/view/src/androidTest/res/xml/slice_style_test.xml
similarity index 100%
rename from slices/view/src/androidTest/res/xml/slice_style_test.xml
rename to slice/view/src/androidTest/res/xml/slice_style_test.xml
diff --git a/slices/view/src/main/AndroidManifest.xml b/slice/view/src/main/AndroidManifest.xml
similarity index 100%
rename from slices/view/src/main/AndroidManifest.xml
rename to slice/view/src/main/AndroidManifest.xml
diff --git a/slices/view/src/main/java/androidx/slice/SliceMetadata.java b/slice/view/src/main/java/androidx/slice/SliceMetadata.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceMetadata.java
rename to slice/view/src/main/java/androidx/slice/SliceMetadata.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceStructure.java b/slice/view/src/main/java/androidx/slice/SliceStructure.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceStructure.java
rename to slice/view/src/main/java/androidx/slice/SliceStructure.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceUtils.java b/slice/view/src/main/java/androidx/slice/SliceUtils.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceUtils.java
rename to slice/view/src/main/java/androidx/slice/SliceUtils.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceViewManager.java b/slice/view/src/main/java/androidx/slice/SliceViewManager.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceViewManager.java
rename to slice/view/src/main/java/androidx/slice/SliceViewManager.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceViewManagerBase.java b/slice/view/src/main/java/androidx/slice/SliceViewManagerBase.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceViewManagerBase.java
rename to slice/view/src/main/java/androidx/slice/SliceViewManagerBase.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceViewManagerCompat.java b/slice/view/src/main/java/androidx/slice/SliceViewManagerCompat.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceViewManagerCompat.java
rename to slice/view/src/main/java/androidx/slice/SliceViewManagerCompat.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceViewManagerWrapper.java b/slice/view/src/main/java/androidx/slice/SliceViewManagerWrapper.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceViewManagerWrapper.java
rename to slice/view/src/main/java/androidx/slice/SliceViewManagerWrapper.java
diff --git a/slices/view/src/main/java/androidx/slice/SliceXml.java b/slice/view/src/main/java/androidx/slice/SliceXml.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/SliceXml.java
rename to slice/view/src/main/java/androidx/slice/SliceXml.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/ActionRow.java b/slice/view/src/main/java/androidx/slice/widget/ActionRow.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/ActionRow.java
rename to slice/view/src/main/java/androidx/slice/widget/ActionRow.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/DisplayedListItems.java b/slice/view/src/main/java/androidx/slice/widget/DisplayedListItems.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/DisplayedListItems.java
rename to slice/view/src/main/java/androidx/slice/widget/DisplayedListItems.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/EventInfo.java b/slice/view/src/main/java/androidx/slice/widget/EventInfo.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/EventInfo.java
rename to slice/view/src/main/java/androidx/slice/widget/EventInfo.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/GridContent.java b/slice/view/src/main/java/androidx/slice/widget/GridContent.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/GridContent.java
rename to slice/view/src/main/java/androidx/slice/widget/GridContent.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/GridRowView.java b/slice/view/src/main/java/androidx/slice/widget/GridRowView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/GridRowView.java
rename to slice/view/src/main/java/androidx/slice/widget/GridRowView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/ListContent.java b/slice/view/src/main/java/androidx/slice/widget/ListContent.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/ListContent.java
rename to slice/view/src/main/java/androidx/slice/widget/ListContent.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java b/slice/view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java
rename to slice/view/src/main/java/androidx/slice/widget/LocationBasedViewTracker.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/MessageView.java b/slice/view/src/main/java/androidx/slice/widget/MessageView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/MessageView.java
rename to slice/view/src/main/java/androidx/slice/widget/MessageView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/RemoteInputView.java b/slice/view/src/main/java/androidx/slice/widget/RemoteInputView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/RemoteInputView.java
rename to slice/view/src/main/java/androidx/slice/widget/RemoteInputView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/RowContent.java b/slice/view/src/main/java/androidx/slice/widget/RowContent.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/RowContent.java
rename to slice/view/src/main/java/androidx/slice/widget/RowContent.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/RowStyle.java b/slice/view/src/main/java/androidx/slice/widget/RowStyle.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/RowStyle.java
rename to slice/view/src/main/java/androidx/slice/widget/RowStyle.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/RowStyleFactory.java b/slice/view/src/main/java/androidx/slice/widget/RowStyleFactory.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/RowStyleFactory.java
rename to slice/view/src/main/java/androidx/slice/widget/RowStyleFactory.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/RowView.java b/slice/view/src/main/java/androidx/slice/widget/RowView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/RowView.java
rename to slice/view/src/main/java/androidx/slice/widget/RowView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/ShortcutView.java b/slice/view/src/main/java/androidx/slice/widget/ShortcutView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/ShortcutView.java
rename to slice/view/src/main/java/androidx/slice/widget/ShortcutView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceActionView.java b/slice/view/src/main/java/androidx/slice/widget/SliceActionView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceActionView.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceActionView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceAdapter.java b/slice/view/src/main/java/androidx/slice/widget/SliceAdapter.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceAdapter.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceAdapter.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceChildView.java b/slice/view/src/main/java/androidx/slice/widget/SliceChildView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceChildView.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceChildView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceContent.java b/slice/view/src/main/java/androidx/slice/widget/SliceContent.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceContent.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceContent.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceLiveData.java b/slice/view/src/main/java/androidx/slice/widget/SliceLiveData.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceLiveData.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceLiveData.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceMetrics.java b/slice/view/src/main/java/androidx/slice/widget/SliceMetrics.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceMetrics.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceMetrics.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java b/slice/view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceMetricsWrapper.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceStyle.java b/slice/view/src/main/java/androidx/slice/widget/SliceStyle.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceStyle.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceStyle.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceView.java b/slice/view/src/main/java/androidx/slice/widget/SliceView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceView.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceView.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceViewPolicy.java b/slice/view/src/main/java/androidx/slice/widget/SliceViewPolicy.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceViewPolicy.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceViewPolicy.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/SliceViewUtil.java b/slice/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
rename to slice/view/src/main/java/androidx/slice/widget/SliceViewUtil.java
diff --git a/slices/view/src/main/java/androidx/slice/widget/TemplateView.java b/slice/view/src/main/java/androidx/slice/widget/TemplateView.java
similarity index 100%
rename from slices/view/src/main/java/androidx/slice/widget/TemplateView.java
rename to slice/view/src/main/java/androidx/slice/widget/TemplateView.java
diff --git a/slices/view/src/main/res-public/values/public_attrs.xml b/slice/view/src/main/res-public/values/public_attrs.xml
similarity index 100%
rename from slices/view/src/main/res-public/values/public_attrs.xml
rename to slice/view/src/main/res-public/values/public_attrs.xml
diff --git a/slices/view/src/main/res-public/values/public_styles.xml b/slice/view/src/main/res-public/values/public_styles.xml
similarity index 100%
rename from slices/view/src/main/res-public/values/public_styles.xml
rename to slice/view/src/main/res-public/values/public_styles.xml
diff --git a/slices/view/src/main/res/drawable/abc_ic_slice_send.xml b/slice/view/src/main/res/drawable/abc_ic_slice_send.xml
similarity index 100%
rename from slices/view/src/main/res/drawable/abc_ic_slice_send.xml
rename to slice/view/src/main/res/drawable/abc_ic_slice_send.xml
diff --git a/slices/view/src/main/res/drawable/abc_slice_gradient.xml b/slice/view/src/main/res/drawable/abc_slice_gradient.xml
similarity index 100%
rename from slices/view/src/main/res/drawable/abc_slice_gradient.xml
rename to slice/view/src/main/res/drawable/abc_slice_gradient.xml
diff --git a/slices/view/src/main/res/drawable/abc_slice_remote_input_bg.xml b/slice/view/src/main/res/drawable/abc_slice_remote_input_bg.xml
similarity index 100%
rename from slices/view/src/main/res/drawable/abc_slice_remote_input_bg.xml
rename to slice/view/src/main/res/drawable/abc_slice_remote_input_bg.xml
diff --git a/slices/view/src/main/res/drawable/abc_slice_ripple_drawable.xml b/slice/view/src/main/res/drawable/abc_slice_ripple_drawable.xml
similarity index 100%
rename from slices/view/src/main/res/drawable/abc_slice_ripple_drawable.xml
rename to slice/view/src/main/res/drawable/abc_slice_ripple_drawable.xml
diff --git a/slices/view/src/main/res/drawable/abc_slice_see_more_bg.xml b/slice/view/src/main/res/drawable/abc_slice_see_more_bg.xml
similarity index 100%
rename from slices/view/src/main/res/drawable/abc_slice_see_more_bg.xml
rename to slice/view/src/main/res/drawable/abc_slice_see_more_bg.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_grid.xml b/slice/view/src/main/res/layout/abc_slice_grid.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_grid.xml
rename to slice/view/src/main/res/layout/abc_slice_grid.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_grid_see_more.xml b/slice/view/src/main/res/layout/abc_slice_grid_see_more.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_grid_see_more.xml
rename to slice/view/src/main/res/layout/abc_slice_grid_see_more.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml b/slice/view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml
rename to slice/view/src/main/res/layout/abc_slice_grid_see_more_overlay.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml b/slice/view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml
rename to slice/view/src/main/res/layout/abc_slice_grid_text_overlay_image.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_message.xml b/slice/view/src/main/res/layout/abc_slice_message.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_message.xml
rename to slice/view/src/main/res/layout/abc_slice_message.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_message_local.xml b/slice/view/src/main/res/layout/abc_slice_message_local.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_message_local.xml
rename to slice/view/src/main/res/layout/abc_slice_message_local.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_progress_inline_view.xml b/slice/view/src/main/res/layout/abc_slice_progress_inline_view.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_progress_inline_view.xml
rename to slice/view/src/main/res/layout/abc_slice_progress_inline_view.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_progress_view.xml b/slice/view/src/main/res/layout/abc_slice_progress_view.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_progress_view.xml
rename to slice/view/src/main/res/layout/abc_slice_progress_view.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_remote_input.xml b/slice/view/src/main/res/layout/abc_slice_remote_input.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_remote_input.xml
rename to slice/view/src/main/res/layout/abc_slice_remote_input.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_row_selection.xml b/slice/view/src/main/res/layout/abc_slice_row_selection.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_row_selection.xml
rename to slice/view/src/main/res/layout/abc_slice_row_selection.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml b/slice/view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml
rename to slice/view/src/main/res/layout/abc_slice_row_selection_dropdown_text.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_row_selection_text.xml b/slice/view/src/main/res/layout/abc_slice_row_selection_text.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_row_selection_text.xml
rename to slice/view/src/main/res/layout/abc_slice_row_selection_text.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_row_show_more.xml b/slice/view/src/main/res/layout/abc_slice_row_show_more.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_row_show_more.xml
rename to slice/view/src/main/res/layout/abc_slice_row_show_more.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_secondary_text.xml b/slice/view/src/main/res/layout/abc_slice_secondary_text.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_secondary_text.xml
rename to slice/view/src/main/res/layout/abc_slice_secondary_text.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_seekbar_view.xml b/slice/view/src/main/res/layout/abc_slice_seekbar_view.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_seekbar_view.xml
rename to slice/view/src/main/res/layout/abc_slice_seekbar_view.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_small_template.xml b/slice/view/src/main/res/layout/abc_slice_small_template.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_small_template.xml
rename to slice/view/src/main/res/layout/abc_slice_small_template.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_switch.xml b/slice/view/src/main/res/layout/abc_slice_switch.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_switch.xml
rename to slice/view/src/main/res/layout/abc_slice_switch.xml
diff --git a/slices/view/src/main/res/layout/abc_slice_title.xml b/slice/view/src/main/res/layout/abc_slice_title.xml
similarity index 100%
rename from slices/view/src/main/res/layout/abc_slice_title.xml
rename to slice/view/src/main/res/layout/abc_slice_title.xml
diff --git a/slices/view/src/main/res/values-af/strings.xml b/slice/view/src/main/res/values-af/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-af/strings.xml
rename to slice/view/src/main/res/values-af/strings.xml
diff --git a/slices/view/src/main/res/values-am/strings.xml b/slice/view/src/main/res/values-am/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-am/strings.xml
rename to slice/view/src/main/res/values-am/strings.xml
diff --git a/slices/view/src/main/res/values-ar/strings.xml b/slice/view/src/main/res/values-ar/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ar/strings.xml
rename to slice/view/src/main/res/values-ar/strings.xml
diff --git a/slices/view/src/main/res/values-as/strings.xml b/slice/view/src/main/res/values-as/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-as/strings.xml
rename to slice/view/src/main/res/values-as/strings.xml
diff --git a/slices/view/src/main/res/values-az/strings.xml b/slice/view/src/main/res/values-az/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-az/strings.xml
rename to slice/view/src/main/res/values-az/strings.xml
diff --git a/slices/view/src/main/res/values-b+sr+Latn/strings.xml b/slice/view/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-b+sr+Latn/strings.xml
rename to slice/view/src/main/res/values-b+sr+Latn/strings.xml
diff --git a/slices/view/src/main/res/values-be/strings.xml b/slice/view/src/main/res/values-be/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-be/strings.xml
rename to slice/view/src/main/res/values-be/strings.xml
diff --git a/slices/view/src/main/res/values-bg/strings.xml b/slice/view/src/main/res/values-bg/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-bg/strings.xml
rename to slice/view/src/main/res/values-bg/strings.xml
diff --git a/slices/view/src/main/res/values-bn/strings.xml b/slice/view/src/main/res/values-bn/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-bn/strings.xml
rename to slice/view/src/main/res/values-bn/strings.xml
diff --git a/slices/view/src/main/res/values-bs/strings.xml b/slice/view/src/main/res/values-bs/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-bs/strings.xml
rename to slice/view/src/main/res/values-bs/strings.xml
diff --git a/slices/view/src/main/res/values-ca/strings.xml b/slice/view/src/main/res/values-ca/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ca/strings.xml
rename to slice/view/src/main/res/values-ca/strings.xml
diff --git a/slices/view/src/main/res/values-cs/strings.xml b/slice/view/src/main/res/values-cs/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-cs/strings.xml
rename to slice/view/src/main/res/values-cs/strings.xml
diff --git a/slices/view/src/main/res/values-da/strings.xml b/slice/view/src/main/res/values-da/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-da/strings.xml
rename to slice/view/src/main/res/values-da/strings.xml
diff --git a/slices/view/src/main/res/values-de/strings.xml b/slice/view/src/main/res/values-de/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-de/strings.xml
rename to slice/view/src/main/res/values-de/strings.xml
diff --git a/slices/view/src/main/res/values-el/strings.xml b/slice/view/src/main/res/values-el/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-el/strings.xml
rename to slice/view/src/main/res/values-el/strings.xml
diff --git a/slices/view/src/main/res/values-en-rAU/strings.xml b/slice/view/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-en-rAU/strings.xml
rename to slice/view/src/main/res/values-en-rAU/strings.xml
diff --git a/slices/view/src/main/res/values-en-rCA/strings.xml b/slice/view/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-en-rCA/strings.xml
rename to slice/view/src/main/res/values-en-rCA/strings.xml
diff --git a/slices/view/src/main/res/values-en-rGB/strings.xml b/slice/view/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-en-rGB/strings.xml
rename to slice/view/src/main/res/values-en-rGB/strings.xml
diff --git a/slices/view/src/main/res/values-en-rIN/strings.xml b/slice/view/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-en-rIN/strings.xml
rename to slice/view/src/main/res/values-en-rIN/strings.xml
diff --git a/slices/view/src/main/res/values-en-rXC/strings.xml b/slice/view/src/main/res/values-en-rXC/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-en-rXC/strings.xml
rename to slice/view/src/main/res/values-en-rXC/strings.xml
diff --git a/slices/view/src/main/res/values-es-rUS/strings.xml b/slice/view/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-es-rUS/strings.xml
rename to slice/view/src/main/res/values-es-rUS/strings.xml
diff --git a/slices/view/src/main/res/values-es/strings.xml b/slice/view/src/main/res/values-es/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-es/strings.xml
rename to slice/view/src/main/res/values-es/strings.xml
diff --git a/slices/view/src/main/res/values-et/strings.xml b/slice/view/src/main/res/values-et/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-et/strings.xml
rename to slice/view/src/main/res/values-et/strings.xml
diff --git a/slices/view/src/main/res/values-eu/strings.xml b/slice/view/src/main/res/values-eu/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-eu/strings.xml
rename to slice/view/src/main/res/values-eu/strings.xml
diff --git a/slices/view/src/main/res/values-fa/strings.xml b/slice/view/src/main/res/values-fa/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-fa/strings.xml
rename to slice/view/src/main/res/values-fa/strings.xml
diff --git a/slices/view/src/main/res/values-fi/strings.xml b/slice/view/src/main/res/values-fi/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-fi/strings.xml
rename to slice/view/src/main/res/values-fi/strings.xml
diff --git a/slices/view/src/main/res/values-fr-rCA/strings.xml b/slice/view/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-fr-rCA/strings.xml
rename to slice/view/src/main/res/values-fr-rCA/strings.xml
diff --git a/slices/view/src/main/res/values-fr/strings.xml b/slice/view/src/main/res/values-fr/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-fr/strings.xml
rename to slice/view/src/main/res/values-fr/strings.xml
diff --git a/slices/view/src/main/res/values-gl/strings.xml b/slice/view/src/main/res/values-gl/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-gl/strings.xml
rename to slice/view/src/main/res/values-gl/strings.xml
diff --git a/slices/view/src/main/res/values-gu/strings.xml b/slice/view/src/main/res/values-gu/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-gu/strings.xml
rename to slice/view/src/main/res/values-gu/strings.xml
diff --git a/slices/view/src/main/res/values-hi/strings.xml b/slice/view/src/main/res/values-hi/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-hi/strings.xml
rename to slice/view/src/main/res/values-hi/strings.xml
diff --git a/slices/view/src/main/res/values-hr/strings.xml b/slice/view/src/main/res/values-hr/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-hr/strings.xml
rename to slice/view/src/main/res/values-hr/strings.xml
diff --git a/slices/view/src/main/res/values-hu/strings.xml b/slice/view/src/main/res/values-hu/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-hu/strings.xml
rename to slice/view/src/main/res/values-hu/strings.xml
diff --git a/slices/view/src/main/res/values-hy/strings.xml b/slice/view/src/main/res/values-hy/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-hy/strings.xml
rename to slice/view/src/main/res/values-hy/strings.xml
diff --git a/slices/view/src/main/res/values-in/strings.xml b/slice/view/src/main/res/values-in/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-in/strings.xml
rename to slice/view/src/main/res/values-in/strings.xml
diff --git a/slices/view/src/main/res/values-is/strings.xml b/slice/view/src/main/res/values-is/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-is/strings.xml
rename to slice/view/src/main/res/values-is/strings.xml
diff --git a/slices/view/src/main/res/values-it/strings.xml b/slice/view/src/main/res/values-it/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-it/strings.xml
rename to slice/view/src/main/res/values-it/strings.xml
diff --git a/slices/view/src/main/res/values-iw/strings.xml b/slice/view/src/main/res/values-iw/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-iw/strings.xml
rename to slice/view/src/main/res/values-iw/strings.xml
diff --git a/slices/view/src/main/res/values-ja/strings.xml b/slice/view/src/main/res/values-ja/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ja/strings.xml
rename to slice/view/src/main/res/values-ja/strings.xml
diff --git a/slices/view/src/main/res/values-ka/strings.xml b/slice/view/src/main/res/values-ka/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ka/strings.xml
rename to slice/view/src/main/res/values-ka/strings.xml
diff --git a/slices/view/src/main/res/values-kk/strings.xml b/slice/view/src/main/res/values-kk/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-kk/strings.xml
rename to slice/view/src/main/res/values-kk/strings.xml
diff --git a/slices/view/src/main/res/values-km/strings.xml b/slice/view/src/main/res/values-km/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-km/strings.xml
rename to slice/view/src/main/res/values-km/strings.xml
diff --git a/slices/view/src/main/res/values-kn/strings.xml b/slice/view/src/main/res/values-kn/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-kn/strings.xml
rename to slice/view/src/main/res/values-kn/strings.xml
diff --git a/slices/view/src/main/res/values-ko/strings.xml b/slice/view/src/main/res/values-ko/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ko/strings.xml
rename to slice/view/src/main/res/values-ko/strings.xml
diff --git a/slices/view/src/main/res/values-ky/strings.xml b/slice/view/src/main/res/values-ky/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ky/strings.xml
rename to slice/view/src/main/res/values-ky/strings.xml
diff --git a/slices/view/src/main/res/values-lo/strings.xml b/slice/view/src/main/res/values-lo/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-lo/strings.xml
rename to slice/view/src/main/res/values-lo/strings.xml
diff --git a/slices/view/src/main/res/values-lt/strings.xml b/slice/view/src/main/res/values-lt/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-lt/strings.xml
rename to slice/view/src/main/res/values-lt/strings.xml
diff --git a/slices/view/src/main/res/values-lv/strings.xml b/slice/view/src/main/res/values-lv/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-lv/strings.xml
rename to slice/view/src/main/res/values-lv/strings.xml
diff --git a/slices/view/src/main/res/values-mk/strings.xml b/slice/view/src/main/res/values-mk/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-mk/strings.xml
rename to slice/view/src/main/res/values-mk/strings.xml
diff --git a/slices/view/src/main/res/values-ml/strings.xml b/slice/view/src/main/res/values-ml/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ml/strings.xml
rename to slice/view/src/main/res/values-ml/strings.xml
diff --git a/slices/view/src/main/res/values-mn/strings.xml b/slice/view/src/main/res/values-mn/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-mn/strings.xml
rename to slice/view/src/main/res/values-mn/strings.xml
diff --git a/slices/view/src/main/res/values-mr/strings.xml b/slice/view/src/main/res/values-mr/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-mr/strings.xml
rename to slice/view/src/main/res/values-mr/strings.xml
diff --git a/slices/view/src/main/res/values-ms/strings.xml b/slice/view/src/main/res/values-ms/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ms/strings.xml
rename to slice/view/src/main/res/values-ms/strings.xml
diff --git a/slices/view/src/main/res/values-my/strings.xml b/slice/view/src/main/res/values-my/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-my/strings.xml
rename to slice/view/src/main/res/values-my/strings.xml
diff --git a/slices/view/src/main/res/values-nb/strings.xml b/slice/view/src/main/res/values-nb/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-nb/strings.xml
rename to slice/view/src/main/res/values-nb/strings.xml
diff --git a/slices/view/src/main/res/values-ne/strings.xml b/slice/view/src/main/res/values-ne/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ne/strings.xml
rename to slice/view/src/main/res/values-ne/strings.xml
diff --git a/slices/view/src/main/res/values-nl/strings.xml b/slice/view/src/main/res/values-nl/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-nl/strings.xml
rename to slice/view/src/main/res/values-nl/strings.xml
diff --git a/slices/view/src/main/res/values-or/strings.xml b/slice/view/src/main/res/values-or/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-or/strings.xml
rename to slice/view/src/main/res/values-or/strings.xml
diff --git a/slices/view/src/main/res/values-pa/strings.xml b/slice/view/src/main/res/values-pa/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-pa/strings.xml
rename to slice/view/src/main/res/values-pa/strings.xml
diff --git a/slices/view/src/main/res/values-pl/strings.xml b/slice/view/src/main/res/values-pl/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-pl/strings.xml
rename to slice/view/src/main/res/values-pl/strings.xml
diff --git a/slices/view/src/main/res/values-pt-rBR/strings.xml b/slice/view/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-pt-rBR/strings.xml
rename to slice/view/src/main/res/values-pt-rBR/strings.xml
diff --git a/slices/view/src/main/res/values-pt-rPT/strings.xml b/slice/view/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-pt-rPT/strings.xml
rename to slice/view/src/main/res/values-pt-rPT/strings.xml
diff --git a/slices/view/src/main/res/values-pt/strings.xml b/slice/view/src/main/res/values-pt/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-pt/strings.xml
rename to slice/view/src/main/res/values-pt/strings.xml
diff --git a/slices/view/src/main/res/values-ro/strings.xml b/slice/view/src/main/res/values-ro/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ro/strings.xml
rename to slice/view/src/main/res/values-ro/strings.xml
diff --git a/slices/view/src/main/res/values-ru/strings.xml b/slice/view/src/main/res/values-ru/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ru/strings.xml
rename to slice/view/src/main/res/values-ru/strings.xml
diff --git a/slices/view/src/main/res/values-si/strings.xml b/slice/view/src/main/res/values-si/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-si/strings.xml
rename to slice/view/src/main/res/values-si/strings.xml
diff --git a/slices/view/src/main/res/values-sk/strings.xml b/slice/view/src/main/res/values-sk/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-sk/strings.xml
rename to slice/view/src/main/res/values-sk/strings.xml
diff --git a/slices/view/src/main/res/values-sl/strings.xml b/slice/view/src/main/res/values-sl/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-sl/strings.xml
rename to slice/view/src/main/res/values-sl/strings.xml
diff --git a/slices/view/src/main/res/values-sq/strings.xml b/slice/view/src/main/res/values-sq/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-sq/strings.xml
rename to slice/view/src/main/res/values-sq/strings.xml
diff --git a/slices/view/src/main/res/values-sr/strings.xml b/slice/view/src/main/res/values-sr/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-sr/strings.xml
rename to slice/view/src/main/res/values-sr/strings.xml
diff --git a/slices/view/src/main/res/values-sv/strings.xml b/slice/view/src/main/res/values-sv/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-sv/strings.xml
rename to slice/view/src/main/res/values-sv/strings.xml
diff --git a/slices/view/src/main/res/values-sw/strings.xml b/slice/view/src/main/res/values-sw/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-sw/strings.xml
rename to slice/view/src/main/res/values-sw/strings.xml
diff --git a/slices/view/src/main/res/values-ta/strings.xml b/slice/view/src/main/res/values-ta/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ta/strings.xml
rename to slice/view/src/main/res/values-ta/strings.xml
diff --git a/slices/view/src/main/res/values-te/strings.xml b/slice/view/src/main/res/values-te/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-te/strings.xml
rename to slice/view/src/main/res/values-te/strings.xml
diff --git a/slices/view/src/main/res/values-th/strings.xml b/slice/view/src/main/res/values-th/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-th/strings.xml
rename to slice/view/src/main/res/values-th/strings.xml
diff --git a/slices/view/src/main/res/values-tl/strings.xml b/slice/view/src/main/res/values-tl/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-tl/strings.xml
rename to slice/view/src/main/res/values-tl/strings.xml
diff --git a/slices/view/src/main/res/values-tr/strings.xml b/slice/view/src/main/res/values-tr/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-tr/strings.xml
rename to slice/view/src/main/res/values-tr/strings.xml
diff --git a/slices/view/src/main/res/values-uk/strings.xml b/slice/view/src/main/res/values-uk/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-uk/strings.xml
rename to slice/view/src/main/res/values-uk/strings.xml
diff --git a/slices/view/src/main/res/values-ur/strings.xml b/slice/view/src/main/res/values-ur/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-ur/strings.xml
rename to slice/view/src/main/res/values-ur/strings.xml
diff --git a/slices/view/src/main/res/values-uz/strings.xml b/slice/view/src/main/res/values-uz/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-uz/strings.xml
rename to slice/view/src/main/res/values-uz/strings.xml
diff --git a/slices/view/src/main/res/values-vi/strings.xml b/slice/view/src/main/res/values-vi/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-vi/strings.xml
rename to slice/view/src/main/res/values-vi/strings.xml
diff --git a/slices/view/src/main/res/values-zh-rCN/strings.xml b/slice/view/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-zh-rCN/strings.xml
rename to slice/view/src/main/res/values-zh-rCN/strings.xml
diff --git a/slices/view/src/main/res/values-zh-rHK/strings.xml b/slice/view/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-zh-rHK/strings.xml
rename to slice/view/src/main/res/values-zh-rHK/strings.xml
diff --git a/slices/view/src/main/res/values-zh-rTW/strings.xml b/slice/view/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-zh-rTW/strings.xml
rename to slice/view/src/main/res/values-zh-rTW/strings.xml
diff --git a/slices/view/src/main/res/values-zu/strings.xml b/slice/view/src/main/res/values-zu/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values-zu/strings.xml
rename to slice/view/src/main/res/values-zu/strings.xml
diff --git a/slices/view/src/main/res/values/attrs.xml b/slice/view/src/main/res/values/attrs.xml
similarity index 100%
rename from slices/view/src/main/res/values/attrs.xml
rename to slice/view/src/main/res/values/attrs.xml
diff --git a/slices/view/src/main/res/values/dimens.xml b/slice/view/src/main/res/values/dimens.xml
similarity index 100%
rename from slices/view/src/main/res/values/dimens.xml
rename to slice/view/src/main/res/values/dimens.xml
diff --git a/slices/view/src/main/res/values/strings.xml b/slice/view/src/main/res/values/strings.xml
similarity index 100%
rename from slices/view/src/main/res/values/strings.xml
rename to slice/view/src/main/res/values/strings.xml
diff --git a/slices/view/src/main/res/values/styles.xml b/slice/view/src/main/res/values/styles.xml
similarity index 100%
rename from slices/view/src/main/res/values/styles.xml
rename to slice/view/src/main/res/values/styles.xml
diff --git a/tv-provider/OWNERS b/tvprovider/OWNERS
similarity index 100%
rename from tv-provider/OWNERS
rename to tvprovider/OWNERS
diff --git a/tv-provider/tv-provider/api/api_lint.ignore b/tvprovider/tv-provider/api/api_lint.ignore
similarity index 100%
rename from tv-provider/tv-provider/api/api_lint.ignore
rename to tvprovider/tv-provider/api/api_lint.ignore
diff --git a/tv-provider/tv-provider/api/current.txt b/tvprovider/tv-provider/api/current.txt
similarity index 100%
rename from tv-provider/tv-provider/api/current.txt
rename to tvprovider/tv-provider/api/current.txt
diff --git a/tv-provider/tv-provider/api/public_plus_experimental_1.0.0.txt b/tvprovider/tv-provider/api/public_plus_experimental_1.0.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api/public_plus_experimental_1.0.0.txt
rename to tvprovider/tv-provider/api/public_plus_experimental_1.0.0.txt
diff --git a/tv-provider/tv-provider/api/public_plus_experimental_current.txt b/tvprovider/tv-provider/api/public_plus_experimental_current.txt
similarity index 100%
rename from tv-provider/tv-provider/api/public_plus_experimental_current.txt
rename to tvprovider/tv-provider/api/public_plus_experimental_current.txt
diff --git a/tv-provider/tv-provider/api/res-1.0.0.txt b/tvprovider/tv-provider/api/res-1.0.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api/res-1.0.0.txt
rename to tvprovider/tv-provider/api/res-1.0.0.txt
diff --git a/tv-provider/tv-provider/api/res-current.txt b/tvprovider/tv-provider/api/res-current.txt
similarity index 100%
rename from tv-provider/tv-provider/api/res-current.txt
rename to tvprovider/tv-provider/api/res-current.txt
diff --git a/tv-provider/tv-provider/api/restricted_1.0.0.txt b/tvprovider/tv-provider/api/restricted_1.0.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api/restricted_1.0.0.txt
rename to tvprovider/tv-provider/api/restricted_1.0.0.txt
diff --git a/tv-provider/tv-provider/api/restricted_current.txt b/tvprovider/tv-provider/api/restricted_current.txt
similarity index 100%
rename from tv-provider/tv-provider/api/restricted_current.txt
rename to tvprovider/tv-provider/api/restricted_current.txt
diff --git a/tv-provider/tv-provider/api_legacy/26.0.0.txt b/tvprovider/tv-provider/api_legacy/26.0.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api_legacy/26.0.0.txt
rename to tvprovider/tv-provider/api_legacy/26.0.0.txt
diff --git a/tv-provider/tv-provider/api_legacy/26.1.0.txt b/tvprovider/tv-provider/api_legacy/26.1.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api_legacy/26.1.0.txt
rename to tvprovider/tv-provider/api_legacy/26.1.0.txt
diff --git a/tv-provider/tv-provider/api_legacy/27.0.0.ignore b/tvprovider/tv-provider/api_legacy/27.0.0.ignore
similarity index 100%
rename from tv-provider/tv-provider/api_legacy/27.0.0.ignore
rename to tvprovider/tv-provider/api_legacy/27.0.0.ignore
diff --git a/tv-provider/tv-provider/api_legacy/27.0.0.txt b/tvprovider/tv-provider/api_legacy/27.0.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api_legacy/27.0.0.txt
rename to tvprovider/tv-provider/api_legacy/27.0.0.txt
diff --git a/tv-provider/tv-provider/api_legacy/27.1.0.txt b/tvprovider/tv-provider/api_legacy/27.1.0.txt
similarity index 100%
rename from tv-provider/tv-provider/api_legacy/27.1.0.txt
rename to tvprovider/tv-provider/api_legacy/27.1.0.txt
diff --git a/tv-provider/tv-provider/api_legacy/current.txt b/tvprovider/tv-provider/api_legacy/current.txt
similarity index 100%
rename from tv-provider/tv-provider/api_legacy/current.txt
rename to tvprovider/tv-provider/api_legacy/current.txt
diff --git a/tv-provider/tv-provider/build.gradle b/tvprovider/tv-provider/build.gradle
similarity index 100%
rename from tv-provider/tv-provider/build.gradle
rename to tvprovider/tv-provider/build.gradle
diff --git a/tv-provider/tv-provider/lint-baseline.xml b/tvprovider/tv-provider/lint-baseline.xml
similarity index 100%
rename from tv-provider/tv-provider/lint-baseline.xml
rename to tvprovider/tv-provider/lint-baseline.xml
diff --git a/tv-provider/tv-provider/src/androidTest/AndroidManifest.xml b/tvprovider/tv-provider/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/AndroidManifest.xml
rename to tvprovider/tv-provider/src/androidTest/AndroidManifest.xml
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/Utils.java
diff --git a/tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java b/tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
rename to tvprovider/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
diff --git a/tv-provider/tv-provider/src/androidTest/res/drawable/test_icon.png b/tvprovider/tv-provider/src/androidTest/res/drawable/test_icon.png
similarity index 100%
rename from tv-provider/tv-provider/src/androidTest/res/drawable/test_icon.png
rename to tvprovider/tv-provider/src/androidTest/res/drawable/test_icon.png
Binary files differ
diff --git a/tv-provider/tv-provider/src/main/AndroidManifest.xml b/tvprovider/tv-provider/src/main/AndroidManifest.xml
similarity index 100%
rename from tv-provider/tv-provider/src/main/AndroidManifest.xml
rename to tvprovider/tv-provider/src/main/AndroidManifest.xml
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Channel.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Channel.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Channel.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Channel.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Program.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Program.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Program.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/Program.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java b/tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java
similarity index 100%
rename from tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java
rename to tvprovider/tv-provider/src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java
diff --git a/wear/compose/material/build.gradle b/wear/compose/material/build.gradle
index 27f348e..17e443f 100644
--- a/wear/compose/material/build.gradle
+++ b/wear/compose/material/build.gradle
@@ -43,7 +43,7 @@
androidTestImplementation project(path: ':compose:ui:ui-test')
androidTestImplementation project(path: ':compose:ui:ui-test-junit4')
androidTestImplementation project(path: ':compose:test-utils')
- androidTestImplementation project(":test-screenshot")
+ androidTestImplementation project(":test:screenshot:test-screenshot")
androidTestImplementation(libs.testRunner)
}
}
@@ -90,7 +90,7 @@
implementation(project(path: ':compose:ui:ui-test'))
implementation(project(path: ':compose:ui:ui-test-junit4'))
implementation(project(path: ':compose:test-utils'))
- implementation(project(":test-screenshot"))
+ implementation(project(":test:screenshot:test-screenshot"))
}
}
}
diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
index 84d006a..f8cf006 100644
--- a/wear/tiles/tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -42,7 +42,7 @@
implementation(libs.kotlinCoroutinesAndroid)
androidTestImplementation(project(path: ":wear:tiles:tiles-proto", configuration: "shadow"))
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
diff --git a/wear/wear-watchface-client/build.gradle b/wear/wear-watchface-client/build.gradle
index 0285903..dd34543 100644
--- a/wear/wear-watchface-client/build.gradle
+++ b/wear/wear-watchface-client/build.gradle
@@ -34,7 +34,7 @@
api(project(":wear:wear-complications-data"))
api(libs.kotlinCoroutinesAndroid)
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(project(":wear:wear-watchface-samples"))
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/wear/wear-watchface/build.gradle b/wear/wear-watchface/build.gradle
index 13f5296..51e2116 100644
--- a/wear/wear-watchface/build.gradle
+++ b/wear/wear-watchface/build.gradle
@@ -35,7 +35,7 @@
implementation("androidx.core:core:1.1.0")
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(project(":wear:wear-watchface-samples"))
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle
index 737681c..654eb8a 100644
--- a/wear/wear/build.gradle
+++ b/wear/wear/build.gradle
@@ -16,7 +16,7 @@
api("androidx.core:core:1.5.0-alpha04")
api("androidx.versionedparcelable:versionedparcelable:1.1.1")
- androidTestImplementation(project(":test-screenshot"))
+ androidTestImplementation(project(":test:screenshot:test-screenshot"))
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
