aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--collection/ktx/OWNERS (renamed from collection-ktx/OWNERS)0
-rw-r--r--collection/ktx/build.gradle (renamed from collection-ktx/build.gradle)0
-rw-r--r--collection/ktx/src/main/java/androidx/collection/ArrayMap.kt (renamed from collection-ktx/src/main/java/androidx/collection/ArrayMap.kt)0
-rw-r--r--collection/ktx/src/main/java/androidx/collection/ArraySet.kt (renamed from collection-ktx/src/main/java/androidx/collection/ArraySet.kt)0
-rw-r--r--collection/ktx/src/main/java/androidx/collection/LongSparseArray.kt (renamed from collection-ktx/src/main/java/androidx/collection/LongSparseArray.kt)0
-rw-r--r--collection/ktx/src/main/java/androidx/collection/LruCache.kt (renamed from collection-ktx/src/main/java/androidx/collection/LruCache.kt)0
-rw-r--r--collection/ktx/src/main/java/androidx/collection/SparseArray.kt (renamed from collection-ktx/src/main/java/androidx/collection/SparseArray.kt)0
-rw-r--r--collection/ktx/src/test/java/androidx/collection/ArrayMapTest.kt (renamed from collection-ktx/src/test/java/androidx/collection/ArrayMapTest.kt)0
-rw-r--r--collection/ktx/src/test/java/androidx/collection/ArraySetTest.kt (renamed from collection-ktx/src/test/java/androidx/collection/ArraySetTest.kt)0
-rw-r--r--collection/ktx/src/test/java/androidx/collection/LongSparseArrayTest.kt (renamed from collection-ktx/src/test/java/androidx/collection/LongSparseArrayTest.kt)0
-rw-r--r--collection/ktx/src/test/java/androidx/collection/LruCacheTest.kt (renamed from collection-ktx/src/test/java/androidx/collection/LruCacheTest.kt)0
-rw-r--r--collection/ktx/src/test/java/androidx/collection/SparseArrayTest.kt (renamed from collection-ktx/src/test/java/androidx/collection/SparseArrayTest.kt)0
-rw-r--r--palette/ktx/OWNERS (renamed from palette-ktx/OWNERS)0
-rw-r--r--palette/ktx/build.gradle (renamed from palette-ktx/build.gradle)0
-rw-r--r--palette/ktx/src/androidTest/java/androidx/palette/graphics/PaletteTest.kt (renamed from palette-ktx/src/androidTest/java/androidx/palette/graphics/PaletteTest.kt)0
-rw-r--r--palette/ktx/src/main/AndroidManifest.xml (renamed from palette-ktx/src/main/AndroidManifest.xml)0
-rw-r--r--palette/ktx/src/main/java/androidx/palette/graphics/Palette.kt (renamed from palette-ktx/src/main/java/androidx/palette/graphics/Palette.kt)0
-rw-r--r--settings.gradle4
18 files changed, 2 insertions, 2 deletions
diff --git a/collection-ktx/OWNERS b/collection/ktx/OWNERS
index e450f4c5cff..e450f4c5cff 100644
--- a/collection-ktx/OWNERS
+++ b/collection/ktx/OWNERS
diff --git a/collection-ktx/build.gradle b/collection/ktx/build.gradle
index 83944f203a7..83944f203a7 100644
--- a/collection-ktx/build.gradle
+++ b/collection/ktx/build.gradle
diff --git a/collection-ktx/src/main/java/androidx/collection/ArrayMap.kt b/collection/ktx/src/main/java/androidx/collection/ArrayMap.kt
index 8f3299e0c62..8f3299e0c62 100644
--- a/collection-ktx/src/main/java/androidx/collection/ArrayMap.kt
+++ b/collection/ktx/src/main/java/androidx/collection/ArrayMap.kt
diff --git a/collection-ktx/src/main/java/androidx/collection/ArraySet.kt b/collection/ktx/src/main/java/androidx/collection/ArraySet.kt
index 07b4be7b376..07b4be7b376 100644
--- a/collection-ktx/src/main/java/androidx/collection/ArraySet.kt
+++ b/collection/ktx/src/main/java/androidx/collection/ArraySet.kt
diff --git a/collection-ktx/src/main/java/androidx/collection/LongSparseArray.kt b/collection/ktx/src/main/java/androidx/collection/LongSparseArray.kt
index fd6201ab642..fd6201ab642 100644
--- a/collection-ktx/src/main/java/androidx/collection/LongSparseArray.kt
+++ b/collection/ktx/src/main/java/androidx/collection/LongSparseArray.kt
diff --git a/collection-ktx/src/main/java/androidx/collection/LruCache.kt b/collection/ktx/src/main/java/androidx/collection/LruCache.kt
index 554a012f7ef..554a012f7ef 100644
--- a/collection-ktx/src/main/java/androidx/collection/LruCache.kt
+++ b/collection/ktx/src/main/java/androidx/collection/LruCache.kt
diff --git a/collection-ktx/src/main/java/androidx/collection/SparseArray.kt b/collection/ktx/src/main/java/androidx/collection/SparseArray.kt
index e1d2382a24c..e1d2382a24c 100644
--- a/collection-ktx/src/main/java/androidx/collection/SparseArray.kt
+++ b/collection/ktx/src/main/java/androidx/collection/SparseArray.kt
diff --git a/collection-ktx/src/test/java/androidx/collection/ArrayMapTest.kt b/collection/ktx/src/test/java/androidx/collection/ArrayMapTest.kt
index 8c002dd2691..8c002dd2691 100644
--- a/collection-ktx/src/test/java/androidx/collection/ArrayMapTest.kt
+++ b/collection/ktx/src/test/java/androidx/collection/ArrayMapTest.kt
diff --git a/collection-ktx/src/test/java/androidx/collection/ArraySetTest.kt b/collection/ktx/src/test/java/androidx/collection/ArraySetTest.kt
index 71a561dc3c3..71a561dc3c3 100644
--- a/collection-ktx/src/test/java/androidx/collection/ArraySetTest.kt
+++ b/collection/ktx/src/test/java/androidx/collection/ArraySetTest.kt
diff --git a/collection-ktx/src/test/java/androidx/collection/LongSparseArrayTest.kt b/collection/ktx/src/test/java/androidx/collection/LongSparseArrayTest.kt
index 341966459b9..341966459b9 100644
--- a/collection-ktx/src/test/java/androidx/collection/LongSparseArrayTest.kt
+++ b/collection/ktx/src/test/java/androidx/collection/LongSparseArrayTest.kt
diff --git a/collection-ktx/src/test/java/androidx/collection/LruCacheTest.kt b/collection/ktx/src/test/java/androidx/collection/LruCacheTest.kt
index c47b423c682..c47b423c682 100644
--- a/collection-ktx/src/test/java/androidx/collection/LruCacheTest.kt
+++ b/collection/ktx/src/test/java/androidx/collection/LruCacheTest.kt
diff --git a/collection-ktx/src/test/java/androidx/collection/SparseArrayTest.kt b/collection/ktx/src/test/java/androidx/collection/SparseArrayTest.kt
index 90d46c8a1e3..90d46c8a1e3 100644
--- a/collection-ktx/src/test/java/androidx/collection/SparseArrayTest.kt
+++ b/collection/ktx/src/test/java/androidx/collection/SparseArrayTest.kt
diff --git a/palette-ktx/OWNERS b/palette/ktx/OWNERS
index e450f4c5cff..e450f4c5cff 100644
--- a/palette-ktx/OWNERS
+++ b/palette/ktx/OWNERS
diff --git a/palette-ktx/build.gradle b/palette/ktx/build.gradle
index e5d5d4338bc..e5d5d4338bc 100644
--- a/palette-ktx/build.gradle
+++ b/palette/ktx/build.gradle
diff --git a/palette-ktx/src/androidTest/java/androidx/palette/graphics/PaletteTest.kt b/palette/ktx/src/androidTest/java/androidx/palette/graphics/PaletteTest.kt
index c10849303d4..c10849303d4 100644
--- a/palette-ktx/src/androidTest/java/androidx/palette/graphics/PaletteTest.kt
+++ b/palette/ktx/src/androidTest/java/androidx/palette/graphics/PaletteTest.kt
diff --git a/palette-ktx/src/main/AndroidManifest.xml b/palette/ktx/src/main/AndroidManifest.xml
index f25fda57ffb..f25fda57ffb 100644
--- a/palette-ktx/src/main/AndroidManifest.xml
+++ b/palette/ktx/src/main/AndroidManifest.xml
diff --git a/palette-ktx/src/main/java/androidx/palette/graphics/Palette.kt b/palette/ktx/src/main/java/androidx/palette/graphics/Palette.kt
index 58da09ae16f..58da09ae16f 100644
--- a/palette-ktx/src/main/java/androidx/palette/graphics/Palette.kt
+++ b/palette/ktx/src/main/java/androidx/palette/graphics/Palette.kt
diff --git a/settings.gradle b/settings.gradle
index 3e6c4c7c91d..581897df1f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -40,7 +40,7 @@ includeProject(":browser", "browser")
includeProject(":car", "car")
includeProject(":cardview", "cardview")
includeProject(":collection", "collection")
-includeProject(":collection-ktx", "collection-ktx")
+includeProject(":collection-ktx", "collection/ktx")
includeProject(":contentpaging", "content")
includeProject(":coordinatorlayout", "coordinatorlayout")
includeProject(":core", "compat")
@@ -68,7 +68,7 @@ includeProject(":localbroadcastmanager", "localbroadcastmanager")
includeProject(":media", "media")
includeProject(":mediarouter", "mediarouter")
includeProject(":palette", "palette")
-includeProject(":palette-ktx", "palette-ktx")
+includeProject(":palette-ktx", "palette/ktx")
includeProject(":percentlayout", "percent")
includeProject(":preference", "preference")
includeProject(":print", "print")