Merge changes from topics "am-a3b73616-94e3-4904-b24e-d6060cc6ead9", "am-40126c13-0e23-46b1-8090-19823f284fb2"
* changes:
[automerger] Move tv-provider tests and manifest file to standard gradle directories. am: 73b4198cf4
[automerger] Move palette tests and manifest file to standard gradle directories. am: 9acd5dc5e9
Move tv-provider tests and manifest file to standard gradle directories.
Move palette tests and manifest file to standard gradle directories.
diff --git a/tv-provider/Android.mk b/tv-provider/Android.mk
index 673a350..2368ad3 100644
--- a/tv-provider/Android.mk
+++ b/tv-provider/Android.mk
@@ -25,6 +25,7 @@
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
LOCAL_JAVA_LIBRARIES := \
android-support-annotations
LOCAL_SHARED_ANDROID_LIBRARIES := \
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 8cb0c9e..1c8443a 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -20,6 +20,5 @@
mavenGroup = LibraryGroups.SUPPORT
inceptionYear = "2017"
description = "Android Support Library for TV Provider"
- legacySourceLocation = true
minSdkVersion = 21
}
\ No newline at end of file
diff --git a/tv-provider/tests/AndroidManifest.xml b/tv-provider/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from tv-provider/tests/AndroidManifest.xml
rename to tv-provider/src/androidTest/AndroidManifest.xml
diff --git a/tv-provider/tests/NO_DOCS b/tv-provider/src/androidTest/NO_DOCS
similarity index 100%
rename from tv-provider/tests/NO_DOCS
rename to tv-provider/src/androidTest/NO_DOCS
diff --git a/tv-provider/tests/src/android/support/media/tv/ChannelLogoUtilsTest.java b/tv-provider/src/androidTest/java/android/support/media/tv/ChannelLogoUtilsTest.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/ChannelLogoUtilsTest.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/ChannelLogoUtilsTest.java
diff --git a/tv-provider/tests/src/android/support/media/tv/ChannelTest.java b/tv-provider/src/androidTest/java/android/support/media/tv/ChannelTest.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/ChannelTest.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/ChannelTest.java
diff --git a/tv-provider/tests/src/android/support/media/tv/PreviewProgramTest.java b/tv-provider/src/androidTest/java/android/support/media/tv/PreviewProgramTest.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/PreviewProgramTest.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/PreviewProgramTest.java
diff --git a/tv-provider/tests/src/android/support/media/tv/ProgramTest.java b/tv-provider/src/androidTest/java/android/support/media/tv/ProgramTest.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/ProgramTest.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/ProgramTest.java
diff --git a/tv-provider/tests/src/android/support/media/tv/TvContractUtilsTest.java b/tv-provider/src/androidTest/java/android/support/media/tv/TvContractUtilsTest.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/TvContractUtilsTest.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/TvContractUtilsTest.java
diff --git a/tv-provider/tests/src/android/support/media/tv/Utils.java b/tv-provider/src/androidTest/java/android/support/media/tv/Utils.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/Utils.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/Utils.java
diff --git a/tv-provider/tests/src/android/support/media/tv/WatchNextProgramTest.java b/tv-provider/src/androidTest/java/android/support/media/tv/WatchNextProgramTest.java
similarity index 100%
rename from tv-provider/tests/src/android/support/media/tv/WatchNextProgramTest.java
rename to tv-provider/src/androidTest/java/android/support/media/tv/WatchNextProgramTest.java
diff --git a/tv-provider/tests/res/drawable/test_icon.png b/tv-provider/src/androidTest/res/drawable/test_icon.png
similarity index 100%
rename from tv-provider/tests/res/drawable/test_icon.png
rename to tv-provider/src/androidTest/res/drawable/test_icon.png
Binary files differ
diff --git a/tv-provider/AndroidManifest.xml b/tv-provider/src/main/AndroidManifest.xml
similarity index 100%
rename from tv-provider/AndroidManifest.xml
rename to tv-provider/src/main/AndroidManifest.xml
diff --git a/v7/palette/Android.mk b/v7/palette/Android.mk
index 4d680cf..b7dafe9 100644
--- a/v7/palette/Android.mk
+++ b/v7/palette/Android.mk
@@ -29,7 +29,7 @@
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/src/main/res
-LOCAL_MANIFEST_FILE := AndroidManifest.xml
+LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
LOCAL_JAVA_LIBRARIES := \
android-support-annotations
LOCAL_SHARED_ANDROID_LIBRARIES := \
diff --git a/v7/palette/build.gradle b/v7/palette/build.gradle
index b1b12c7..8829dcb 100644
--- a/v7/palette/build.gradle
+++ b/v7/palette/build.gradle
@@ -20,5 +20,4 @@
mavenGroup = LibraryGroups.SUPPORT
inceptionYear = "2014"
description = "Android Support Palette v7"
- legacySourceLocation = true
}
diff --git a/v7/palette/tests/AndroidManifest.xml b/v7/palette/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from v7/palette/tests/AndroidManifest.xml
rename to v7/palette/src/androidTest/AndroidManifest.xml
diff --git a/v7/palette/tests/NO_DOCS b/v7/palette/src/androidTest/NO_DOCS
similarity index 100%
rename from v7/palette/tests/NO_DOCS
rename to v7/palette/src/androidTest/NO_DOCS
diff --git a/v7/palette/tests/java/android/support/v7/graphics/BucketTests.java b/v7/palette/src/androidTest/java/android/support/v7/graphics/BucketTests.java
similarity index 100%
rename from v7/palette/tests/java/android/support/v7/graphics/BucketTests.java
rename to v7/palette/src/androidTest/java/android/support/v7/graphics/BucketTests.java
diff --git a/v7/palette/tests/java/android/support/v7/graphics/ConsistencyTest.java b/v7/palette/src/androidTest/java/android/support/v7/graphics/ConsistencyTest.java
similarity index 100%
rename from v7/palette/tests/java/android/support/v7/graphics/ConsistencyTest.java
rename to v7/palette/src/androidTest/java/android/support/v7/graphics/ConsistencyTest.java
diff --git a/v7/palette/tests/java/android/support/v7/graphics/MaxColorsTest.java b/v7/palette/src/androidTest/java/android/support/v7/graphics/MaxColorsTest.java
similarity index 100%
rename from v7/palette/tests/java/android/support/v7/graphics/MaxColorsTest.java
rename to v7/palette/src/androidTest/java/android/support/v7/graphics/MaxColorsTest.java
diff --git a/v7/palette/tests/java/android/support/v7/graphics/SwatchTests.java b/v7/palette/src/androidTest/java/android/support/v7/graphics/SwatchTests.java
similarity index 100%
rename from v7/palette/tests/java/android/support/v7/graphics/SwatchTests.java
rename to v7/palette/src/androidTest/java/android/support/v7/graphics/SwatchTests.java
diff --git a/v7/palette/tests/java/android/support/v7/graphics/TestUtils.java b/v7/palette/src/androidTest/java/android/support/v7/graphics/TestUtils.java
similarity index 100%
rename from v7/palette/tests/java/android/support/v7/graphics/TestUtils.java
rename to v7/palette/src/androidTest/java/android/support/v7/graphics/TestUtils.java
diff --git a/v7/palette/tests/res/drawable-nodpi/photo.jpg b/v7/palette/src/androidTest/res/drawable-nodpi/photo.jpg
similarity index 100%
rename from v7/palette/tests/res/drawable-nodpi/photo.jpg
rename to v7/palette/src/androidTest/res/drawable-nodpi/photo.jpg
Binary files differ
diff --git a/v7/palette/AndroidManifest.xml b/v7/palette/src/main/AndroidManifest.xml
similarity index 100%
rename from v7/palette/AndroidManifest.xml
rename to v7/palette/src/main/AndroidManifest.xml
