Rename the source of core-utils module to core-utils
One more step left - rename core-combined source "back" to v4
Change-Id: Ic192ca8202498956e63d93dddc106fb6f4b5920b
diff --git a/buildSrc/studioCompat.gradle b/buildSrc/studioCompat.gradle
index 0c6aa48..123eec1 100644
--- a/buildSrc/studioCompat.gradle
+++ b/buildSrc/studioCompat.gradle
@@ -76,7 +76,7 @@
new ApiModule("api24", ApiModule.CURRENT)
],
dependencies : [":support-compat"],
- folder : "v4",
+ folder : "core-utils",
moduleName : "support-core-utils"
],
coreui : [
diff --git a/v4/Android.mk b/core-utils/Android.mk
similarity index 100%
rename from v4/Android.mk
rename to core-utils/Android.mk
diff --git a/v4/AndroidManifest.xml b/core-utils/AndroidManifest.xml
similarity index 100%
rename from v4/AndroidManifest.xml
rename to core-utils/AndroidManifest.xml
diff --git a/v4/api20/android/support/v4/print/PrintHelperApi20.java b/core-utils/api20/android/support/v4/print/PrintHelperApi20.java
similarity index 100%
rename from v4/api20/android/support/v4/print/PrintHelperApi20.java
rename to core-utils/api20/android/support/v4/print/PrintHelperApi20.java
diff --git a/v4/api21/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.java b/core-utils/api21/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.java
similarity index 100%
rename from v4/api21/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.java
rename to core-utils/api21/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.java
diff --git a/v4/api21/android/support/v4/provider/DocumentsContractApi21.java b/core-utils/api21/android/support/v4/provider/DocumentsContractApi21.java
similarity index 100%
rename from v4/api21/android/support/v4/provider/DocumentsContractApi21.java
rename to core-utils/api21/android/support/v4/provider/DocumentsContractApi21.java
diff --git a/v4/api23/android/support/v4/print/PrintHelperApi23.java b/core-utils/api23/android/support/v4/print/PrintHelperApi23.java
similarity index 100%
rename from v4/api23/android/support/v4/print/PrintHelperApi23.java
rename to core-utils/api23/android/support/v4/print/PrintHelperApi23.java
diff --git a/v4/api24/android/support/v4/print/PrintHelperApi24.java b/core-utils/api24/android/support/v4/print/PrintHelperApi24.java
similarity index 100%
rename from v4/api24/android/support/v4/print/PrintHelperApi24.java
rename to core-utils/api24/android/support/v4/print/PrintHelperApi24.java
diff --git a/v4/build.gradle b/core-utils/build.gradle
similarity index 100%
rename from v4/build.gradle
rename to core-utils/build.gradle
diff --git a/v4/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java b/core-utils/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java
similarity index 100%
rename from v4/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java
rename to core-utils/gingerbread/android/support/v4/graphics/drawable/RoundedBitmapDrawable.java
diff --git a/v4/honeycomb/android/support/v4/app/TaskStackBuilderHoneycomb.java b/core-utils/honeycomb/android/support/v4/app/TaskStackBuilderHoneycomb.java
similarity index 100%
rename from v4/honeycomb/android/support/v4/app/TaskStackBuilderHoneycomb.java
rename to core-utils/honeycomb/android/support/v4/app/TaskStackBuilderHoneycomb.java
diff --git a/v4/java/android/support/v4/app/AppLaunchChecker.java b/core-utils/java/android/support/v4/app/AppLaunchChecker.java
similarity index 100%
rename from v4/java/android/support/v4/app/AppLaunchChecker.java
rename to core-utils/java/android/support/v4/app/AppLaunchChecker.java
diff --git a/v4/java/android/support/v4/app/NavUtils.java b/core-utils/java/android/support/v4/app/NavUtils.java
similarity index 100%
rename from v4/java/android/support/v4/app/NavUtils.java
rename to core-utils/java/android/support/v4/app/NavUtils.java
diff --git a/v4/java/android/support/v4/app/TaskStackBuilder.java b/core-utils/java/android/support/v4/app/TaskStackBuilder.java
similarity index 100%
rename from v4/java/android/support/v4/app/TaskStackBuilder.java
rename to core-utils/java/android/support/v4/app/TaskStackBuilder.java
diff --git a/v4/java/android/support/v4/app/package.html b/core-utils/java/android/support/v4/app/package.html
similarity index 100%
rename from v4/java/android/support/v4/app/package.html
rename to core-utils/java/android/support/v4/app/package.html
diff --git a/v4/java/android/support/v4/content/AsyncTaskLoader.java b/core-utils/java/android/support/v4/content/AsyncTaskLoader.java
similarity index 100%
rename from v4/java/android/support/v4/content/AsyncTaskLoader.java
rename to core-utils/java/android/support/v4/content/AsyncTaskLoader.java
diff --git a/v4/java/android/support/v4/content/CursorLoader.java b/core-utils/java/android/support/v4/content/CursorLoader.java
similarity index 100%
rename from v4/java/android/support/v4/content/CursorLoader.java
rename to core-utils/java/android/support/v4/content/CursorLoader.java
diff --git a/v4/java/android/support/v4/content/FileProvider.java b/core-utils/java/android/support/v4/content/FileProvider.java
similarity index 100%
rename from v4/java/android/support/v4/content/FileProvider.java
rename to core-utils/java/android/support/v4/content/FileProvider.java
diff --git a/v4/java/android/support/v4/content/Loader.java b/core-utils/java/android/support/v4/content/Loader.java
similarity index 100%
rename from v4/java/android/support/v4/content/Loader.java
rename to core-utils/java/android/support/v4/content/Loader.java
diff --git a/v4/java/android/support/v4/content/LocalBroadcastManager.java b/core-utils/java/android/support/v4/content/LocalBroadcastManager.java
similarity index 100%
rename from v4/java/android/support/v4/content/LocalBroadcastManager.java
rename to core-utils/java/android/support/v4/content/LocalBroadcastManager.java
diff --git a/v4/java/android/support/v4/content/PermissionChecker.java b/core-utils/java/android/support/v4/content/PermissionChecker.java
similarity index 100%
rename from v4/java/android/support/v4/content/PermissionChecker.java
rename to core-utils/java/android/support/v4/content/PermissionChecker.java
diff --git a/v4/java/android/support/v4/content/WakefulBroadcastReceiver.java b/core-utils/java/android/support/v4/content/WakefulBroadcastReceiver.java
similarity index 100%
rename from v4/java/android/support/v4/content/WakefulBroadcastReceiver.java
rename to core-utils/java/android/support/v4/content/WakefulBroadcastReceiver.java
diff --git a/v4/java/android/support/v4/content/package.html b/core-utils/java/android/support/v4/content/package.html
similarity index 100%
rename from v4/java/android/support/v4/content/package.html
rename to core-utils/java/android/support/v4/content/package.html
diff --git a/v4/java/android/support/v4/content/res/TypedArrayUtils.java b/core-utils/java/android/support/v4/content/res/TypedArrayUtils.java
similarity index 100%
rename from v4/java/android/support/v4/content/res/TypedArrayUtils.java
rename to core-utils/java/android/support/v4/content/res/TypedArrayUtils.java
diff --git a/v4/java/android/support/v4/graphics/ColorUtils.java b/core-utils/java/android/support/v4/graphics/ColorUtils.java
similarity index 100%
rename from v4/java/android/support/v4/graphics/ColorUtils.java
rename to core-utils/java/android/support/v4/graphics/ColorUtils.java
diff --git a/v4/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java b/core-utils/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java
similarity index 100%
rename from v4/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java
rename to core-utils/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java
diff --git a/v4/java/android/support/v4/print/PrintHelper.java b/core-utils/java/android/support/v4/print/PrintHelper.java
similarity index 100%
rename from v4/java/android/support/v4/print/PrintHelper.java
rename to core-utils/java/android/support/v4/print/PrintHelper.java
diff --git a/v4/java/android/support/v4/provider/DocumentFile.java b/core-utils/java/android/support/v4/provider/DocumentFile.java
similarity index 100%
rename from v4/java/android/support/v4/provider/DocumentFile.java
rename to core-utils/java/android/support/v4/provider/DocumentFile.java
diff --git a/v4/java/android/support/v4/provider/RawDocumentFile.java b/core-utils/java/android/support/v4/provider/RawDocumentFile.java
similarity index 100%
rename from v4/java/android/support/v4/provider/RawDocumentFile.java
rename to core-utils/java/android/support/v4/provider/RawDocumentFile.java
diff --git a/v4/java/android/support/v4/provider/SingleDocumentFile.java b/core-utils/java/android/support/v4/provider/SingleDocumentFile.java
similarity index 100%
rename from v4/java/android/support/v4/provider/SingleDocumentFile.java
rename to core-utils/java/android/support/v4/provider/SingleDocumentFile.java
diff --git a/v4/java/android/support/v4/provider/TreeDocumentFile.java b/core-utils/java/android/support/v4/provider/TreeDocumentFile.java
similarity index 100%
rename from v4/java/android/support/v4/provider/TreeDocumentFile.java
rename to core-utils/java/android/support/v4/provider/TreeDocumentFile.java
diff --git a/v4/java/android/support/v4/text/BidiFormatter.java b/core-utils/java/android/support/v4/text/BidiFormatter.java
similarity index 100%
rename from v4/java/android/support/v4/text/BidiFormatter.java
rename to core-utils/java/android/support/v4/text/BidiFormatter.java
diff --git a/v4/jellybean/android/support/v4/app/NavUtilsJB.java b/core-utils/jellybean/android/support/v4/app/NavUtilsJB.java
similarity index 100%
rename from v4/jellybean/android/support/v4/app/NavUtilsJB.java
rename to core-utils/jellybean/android/support/v4/app/NavUtilsJB.java
diff --git a/v4/jellybean/android/support/v4/app/TaskStackBuilderJellybean.java b/core-utils/jellybean/android/support/v4/app/TaskStackBuilderJellybean.java
similarity index 100%
rename from v4/jellybean/android/support/v4/app/TaskStackBuilderJellybean.java
rename to core-utils/jellybean/android/support/v4/app/TaskStackBuilderJellybean.java
diff --git a/v4/kitkat/android/support/v4/print/PrintHelperKitkat.java b/core-utils/kitkat/android/support/v4/print/PrintHelperKitkat.java
similarity index 100%
rename from v4/kitkat/android/support/v4/print/PrintHelperKitkat.java
rename to core-utils/kitkat/android/support/v4/print/PrintHelperKitkat.java
diff --git a/v4/kitkat/android/support/v4/provider/DocumentsContractApi19.java b/core-utils/kitkat/android/support/v4/provider/DocumentsContractApi19.java
similarity index 100%
rename from v4/kitkat/android/support/v4/provider/DocumentsContractApi19.java
rename to core-utils/kitkat/android/support/v4/provider/DocumentsContractApi19.java
diff --git a/v4/tests/AndroidManifest.xml b/core-utils/tests/AndroidManifest.xml
similarity index 100%
rename from v4/tests/AndroidManifest.xml
rename to core-utils/tests/AndroidManifest.xml
diff --git a/v4/tests/NO_DOCS b/core-utils/tests/NO_DOCS
similarity index 100%
rename from v4/tests/NO_DOCS
rename to core-utils/tests/NO_DOCS
diff --git a/v4/tests/java/android/support/v4/content/FileProviderTest.java b/core-utils/tests/java/android/support/v4/content/FileProviderTest.java
similarity index 100%
rename from v4/tests/java/android/support/v4/content/FileProviderTest.java
rename to core-utils/tests/java/android/support/v4/content/FileProviderTest.java
diff --git a/v4/tests/java/android/support/v4/graphics/ColorUtilsTest.java b/core-utils/tests/java/android/support/v4/graphics/ColorUtilsTest.java
similarity index 100%
rename from v4/tests/java/android/support/v4/graphics/ColorUtilsTest.java
rename to core-utils/tests/java/android/support/v4/graphics/ColorUtilsTest.java
diff --git a/v4/tests/java/android/support/v4/text/BidiFormatterTest.java b/core-utils/tests/java/android/support/v4/text/BidiFormatterTest.java
similarity index 100%
rename from v4/tests/java/android/support/v4/text/BidiFormatterTest.java
rename to core-utils/tests/java/android/support/v4/text/BidiFormatterTest.java
diff --git a/v4/tests/res/xml/paths.xml b/core-utils/tests/res/xml/paths.xml
similarity index 100%
rename from v4/tests/res/xml/paths.xml
rename to core-utils/tests/res/xml/paths.xml
diff --git a/settings.gradle b/settings.gradle
index f29434a..a2ec884 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@
project(':support-fragment').projectDir = new File(rootDir, 'fragment')
include ':support-core-utils'
-project(':support-core-utils').projectDir = new File(rootDir, 'v4')
+project(':support-core-utils').projectDir = new File(rootDir, 'core-utils')
include ':support-v4'
project(':support-v4').projectDir = new File(rootDir, 'core-combined')
