| commit | 73e206d6970d808347b1f2747a11057c65179b93 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Dec 15 17:59:49 2017 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Dec 15 17:59:49 2017 +0000 |
| tree | 177668c4cb250f32ff1fa71c6a39ceb05b32cd4c | |
| parent | 1ec17e8cd09ba57a64c5b225d87f0ea919768b2d [diff] | |
| parent | 9acd5dc5e97a3660b3d90485fab1193d9791f2a0 [diff] |
[automerger] Move palette tests and manifest file to standard gradle directories. am: 9acd5dc5e9 Change-Id: Ic70a6f0b6cea382ec7d92c74e1454f94b5227974
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
