[automerger] Move transition tests and manifest file to standard gradle directories. am: da292d81f4 Change-Id: Ibddb7c52f38ee78b6aa54c54314f5665bcda4571

commit: d28503ff153296b993cbbbfae4f88d0299045e27 [log] [tgz]
author: Android Build Merger (Role) <noreply-android-build-merger@google.com> Sun Dec 17 22:18:23 2017 +0000
committer: Android Build Merger (Role) <noreply-android-build-merger@google.com> Sun Dec 17 22:18:23 2017 +0000
tree: 32e1108f27eb0efe9530522de56bf2828fa5fe16
parent: cae865a3811a2bfc071351ab7bd3c5b96bf3ff50 [diff]
parent: da292d81f4ca4dd52d3bd06171f94d19eda93341 [diff]
diff --git a/transition/Android.mk b/transition/Android.mk
index f57ca0b..466cfa8 100644
--- a/transition/Android.mk
+++ b/transition/Android.mk

@@ -28,7 +28,8 @@
 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_RESOURCE_DIR := $(LOCAL_PATH)/src/main/res
+LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
 LOCAL_JAVA_LIBRARIES := \
     android-support-annotations
 LOCAL_SHARED_ANDROID_LIBRARIES := \

diff --git a/transition/build.gradle b/transition/build.gradle
index 7aef8b5..d8257ab 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle

@@ -20,13 +20,6 @@
 }
 
 android {
-    sourceSets {
-        main.res.srcDirs = [
-                'res',
-                'res-public'
-        ]
-    }
-
     buildTypes.all {
         consumerProguardFiles 'proguard-rules.pro'
     }
@@ -43,5 +36,4 @@
     mavenGroup = LibraryGroups.SUPPORT
     inceptionYear = "2016"
     description = "Android Transition Support Library"
-    legacySourceLocation = true
 }

diff --git a/transition/tests/AndroidManifest.xml b/transition/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from transition/tests/AndroidManifest.xml
rename to transition/src/androidTest/AndroidManifest.xml


diff --git a/transition/tests/NO_DOCS b/transition/src/androidTest/NO_DOCS
similarity index 100%
rename from transition/tests/NO_DOCS
rename to transition/src/androidTest/NO_DOCS


diff --git a/transition/tests/src/android/support/transition/ArcMotionTest.java b/transition/src/androidTest/java/android/support/transition/ArcMotionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ArcMotionTest.java
rename to transition/src/androidTest/java/android/support/transition/ArcMotionTest.java


diff --git a/transition/tests/src/android/support/transition/AutoTransitionTest.java b/transition/src/androidTest/java/android/support/transition/AutoTransitionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/AutoTransitionTest.java
rename to transition/src/androidTest/java/android/support/transition/AutoTransitionTest.java


diff --git a/transition/tests/src/android/support/transition/BaseTest.java b/transition/src/androidTest/java/android/support/transition/BaseTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/BaseTest.java
rename to transition/src/androidTest/java/android/support/transition/BaseTest.java


diff --git a/transition/tests/src/android/support/transition/BaseTransitionTest.java b/transition/src/androidTest/java/android/support/transition/BaseTransitionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/BaseTransitionTest.java
rename to transition/src/androidTest/java/android/support/transition/BaseTransitionTest.java


diff --git a/transition/tests/src/android/support/transition/ChangeBoundsTest.java b/transition/src/androidTest/java/android/support/transition/ChangeBoundsTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ChangeBoundsTest.java
rename to transition/src/androidTest/java/android/support/transition/ChangeBoundsTest.java


diff --git a/transition/tests/src/android/support/transition/ChangeClipBoundsTest.java b/transition/src/androidTest/java/android/support/transition/ChangeClipBoundsTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ChangeClipBoundsTest.java
rename to transition/src/androidTest/java/android/support/transition/ChangeClipBoundsTest.java


diff --git a/transition/tests/src/android/support/transition/ChangeImageTransformTest.java b/transition/src/androidTest/java/android/support/transition/ChangeImageTransformTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ChangeImageTransformTest.java
rename to transition/src/androidTest/java/android/support/transition/ChangeImageTransformTest.java


diff --git a/transition/tests/src/android/support/transition/ChangeScrollTest.java b/transition/src/androidTest/java/android/support/transition/ChangeScrollTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ChangeScrollTest.java
rename to transition/src/androidTest/java/android/support/transition/ChangeScrollTest.java


diff --git a/transition/tests/src/android/support/transition/ChangeTransformTest.java b/transition/src/androidTest/java/android/support/transition/ChangeTransformTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ChangeTransformTest.java
rename to transition/src/androidTest/java/android/support/transition/ChangeTransformTest.java


diff --git a/transition/tests/src/android/support/transition/CheckCalledRunnable.java b/transition/src/androidTest/java/android/support/transition/CheckCalledRunnable.java
similarity index 100%
rename from transition/tests/src/android/support/transition/CheckCalledRunnable.java
rename to transition/src/androidTest/java/android/support/transition/CheckCalledRunnable.java


diff --git a/transition/tests/src/android/support/transition/ExplodeTest.java b/transition/src/androidTest/java/android/support/transition/ExplodeTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/ExplodeTest.java
rename to transition/src/androidTest/java/android/support/transition/ExplodeTest.java


diff --git a/transition/tests/src/android/support/transition/FadeTest.java b/transition/src/androidTest/java/android/support/transition/FadeTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/FadeTest.java
rename to transition/src/androidTest/java/android/support/transition/FadeTest.java


diff --git a/transition/tests/src/android/support/transition/FragmentTransitionTest.java b/transition/src/androidTest/java/android/support/transition/FragmentTransitionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/FragmentTransitionTest.java
rename to transition/src/androidTest/java/android/support/transition/FragmentTransitionTest.java


diff --git a/transition/tests/src/android/support/transition/PathMotionTest.java b/transition/src/androidTest/java/android/support/transition/PathMotionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/PathMotionTest.java
rename to transition/src/androidTest/java/android/support/transition/PathMotionTest.java


diff --git a/transition/tests/src/android/support/transition/PatternPathMotionTest.java b/transition/src/androidTest/java/android/support/transition/PatternPathMotionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/PatternPathMotionTest.java
rename to transition/src/androidTest/java/android/support/transition/PatternPathMotionTest.java


diff --git a/transition/tests/src/android/support/transition/PropagationTest.java b/transition/src/androidTest/java/android/support/transition/PropagationTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/PropagationTest.java
rename to transition/src/androidTest/java/android/support/transition/PropagationTest.java


diff --git a/transition/tests/src/android/support/transition/SceneTest.java b/transition/src/androidTest/java/android/support/transition/SceneTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/SceneTest.java
rename to transition/src/androidTest/java/android/support/transition/SceneTest.java


diff --git a/transition/tests/src/android/support/transition/SlideBadEdgeTest.java b/transition/src/androidTest/java/android/support/transition/SlideBadEdgeTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/SlideBadEdgeTest.java
rename to transition/src/androidTest/java/android/support/transition/SlideBadEdgeTest.java


diff --git a/transition/tests/src/android/support/transition/SlideDefaultEdgeTest.java b/transition/src/androidTest/java/android/support/transition/SlideDefaultEdgeTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/SlideDefaultEdgeTest.java
rename to transition/src/androidTest/java/android/support/transition/SlideDefaultEdgeTest.java


diff --git a/transition/tests/src/android/support/transition/SlideEdgeTest.java b/transition/src/androidTest/java/android/support/transition/SlideEdgeTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/SlideEdgeTest.java
rename to transition/src/androidTest/java/android/support/transition/SlideEdgeTest.java


diff --git a/transition/tests/src/android/support/transition/SyncRunnable.java b/transition/src/androidTest/java/android/support/transition/SyncRunnable.java
similarity index 100%
rename from transition/tests/src/android/support/transition/SyncRunnable.java
rename to transition/src/androidTest/java/android/support/transition/SyncRunnable.java


diff --git a/transition/tests/src/android/support/transition/SyncTransitionListener.java b/transition/src/androidTest/java/android/support/transition/SyncTransitionListener.java
similarity index 100%
rename from transition/tests/src/android/support/transition/SyncTransitionListener.java
rename to transition/src/androidTest/java/android/support/transition/SyncTransitionListener.java


diff --git a/transition/tests/src/android/support/transition/TransitionActivity.java b/transition/src/androidTest/java/android/support/transition/TransitionActivity.java
similarity index 100%
rename from transition/tests/src/android/support/transition/TransitionActivity.java
rename to transition/src/androidTest/java/android/support/transition/TransitionActivity.java


diff --git a/transition/tests/src/android/support/transition/TransitionInflaterTest.java b/transition/src/androidTest/java/android/support/transition/TransitionInflaterTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/TransitionInflaterTest.java
rename to transition/src/androidTest/java/android/support/transition/TransitionInflaterTest.java


diff --git a/transition/tests/src/android/support/transition/TransitionManagerTest.java b/transition/src/androidTest/java/android/support/transition/TransitionManagerTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/TransitionManagerTest.java
rename to transition/src/androidTest/java/android/support/transition/TransitionManagerTest.java


diff --git a/transition/tests/src/android/support/transition/TransitionSetTest.java b/transition/src/androidTest/java/android/support/transition/TransitionSetTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/TransitionSetTest.java
rename to transition/src/androidTest/java/android/support/transition/TransitionSetTest.java


diff --git a/transition/tests/src/android/support/transition/TransitionTest.java b/transition/src/androidTest/java/android/support/transition/TransitionTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/TransitionTest.java
rename to transition/src/androidTest/java/android/support/transition/TransitionTest.java


diff --git a/transition/tests/src/android/support/transition/VisibilityTest.java b/transition/src/androidTest/java/android/support/transition/VisibilityTest.java
similarity index 100%
rename from transition/tests/src/android/support/transition/VisibilityTest.java
rename to transition/src/androidTest/java/android/support/transition/VisibilityTest.java


diff --git a/transition/tests/res/layout/activity_transition.xml b/transition/src/androidTest/res/layout/activity_transition.xml
similarity index 100%
rename from transition/tests/res/layout/activity_transition.xml
rename to transition/src/androidTest/res/layout/activity_transition.xml


diff --git a/transition/tests/res/layout/scene1.xml b/transition/src/androidTest/res/layout/scene1.xml
similarity index 100%
rename from transition/tests/res/layout/scene1.xml
rename to transition/src/androidTest/res/layout/scene1.xml


diff --git a/transition/tests/res/layout/scene10.xml b/transition/src/androidTest/res/layout/scene10.xml
similarity index 100%
rename from transition/tests/res/layout/scene10.xml
rename to transition/src/androidTest/res/layout/scene10.xml


diff --git a/transition/tests/res/layout/scene2.xml b/transition/src/androidTest/res/layout/scene2.xml
similarity index 100%
rename from transition/tests/res/layout/scene2.xml
rename to transition/src/androidTest/res/layout/scene2.xml


diff --git a/transition/tests/res/layout/scene3.xml b/transition/src/androidTest/res/layout/scene3.xml
similarity index 100%
rename from transition/tests/res/layout/scene3.xml
rename to transition/src/androidTest/res/layout/scene3.xml


diff --git a/transition/tests/res/layout/scene4.xml b/transition/src/androidTest/res/layout/scene4.xml
similarity index 100%
rename from transition/tests/res/layout/scene4.xml
rename to transition/src/androidTest/res/layout/scene4.xml


diff --git a/transition/tests/res/layout/scene5.xml b/transition/src/androidTest/res/layout/scene5.xml
similarity index 100%
rename from transition/tests/res/layout/scene5.xml
rename to transition/src/androidTest/res/layout/scene5.xml


diff --git a/transition/tests/res/layout/scene6.xml b/transition/src/androidTest/res/layout/scene6.xml
similarity index 100%
rename from transition/tests/res/layout/scene6.xml
rename to transition/src/androidTest/res/layout/scene6.xml


diff --git a/transition/tests/res/layout/scene9.xml b/transition/src/androidTest/res/layout/scene9.xml
similarity index 100%
rename from transition/tests/res/layout/scene9.xml
rename to transition/src/androidTest/res/layout/scene9.xml


diff --git a/transition/tests/res/layout/support_scene0.xml b/transition/src/androidTest/res/layout/support_scene0.xml
similarity index 100%
rename from transition/tests/res/layout/support_scene0.xml
rename to transition/src/androidTest/res/layout/support_scene0.xml


diff --git a/transition/tests/res/layout/support_scene1.xml b/transition/src/androidTest/res/layout/support_scene1.xml
similarity index 100%
rename from transition/tests/res/layout/support_scene1.xml
rename to transition/src/androidTest/res/layout/support_scene1.xml


diff --git a/transition/tests/res/transition/arc_motion.xml b/transition/src/androidTest/res/transition/arc_motion.xml
similarity index 100%
rename from transition/tests/res/transition/arc_motion.xml
rename to transition/src/androidTest/res/transition/arc_motion.xml


diff --git a/transition/tests/res/transition/auto_transition.xml b/transition/src/androidTest/res/transition/auto_transition.xml
similarity index 100%
rename from transition/tests/res/transition/auto_transition.xml
rename to transition/src/androidTest/res/transition/auto_transition.xml


diff --git a/transition/tests/res/transition/change_bounds.xml b/transition/src/androidTest/res/transition/change_bounds.xml
similarity index 100%
rename from transition/tests/res/transition/change_bounds.xml
rename to transition/src/androidTest/res/transition/change_bounds.xml


diff --git a/transition/tests/res/transition/change_clip_bounds.xml b/transition/src/androidTest/res/transition/change_clip_bounds.xml
similarity index 100%
rename from transition/tests/res/transition/change_clip_bounds.xml
rename to transition/src/androidTest/res/transition/change_clip_bounds.xml


diff --git a/transition/tests/res/transition/change_image_transform.xml b/transition/src/androidTest/res/transition/change_image_transform.xml
similarity index 100%
rename from transition/tests/res/transition/change_image_transform.xml
rename to transition/src/androidTest/res/transition/change_image_transform.xml


diff --git a/transition/tests/res/transition/change_scroll.xml b/transition/src/androidTest/res/transition/change_scroll.xml
similarity index 100%
rename from transition/tests/res/transition/change_scroll.xml
rename to transition/src/androidTest/res/transition/change_scroll.xml


diff --git a/transition/tests/res/transition/change_transform.xml b/transition/src/androidTest/res/transition/change_transform.xml
similarity index 100%
rename from transition/tests/res/transition/change_transform.xml
rename to transition/src/androidTest/res/transition/change_transform.xml


diff --git a/transition/tests/res/transition/custom_path_motion.xml b/transition/src/androidTest/res/transition/custom_path_motion.xml
similarity index 100%
rename from transition/tests/res/transition/custom_path_motion.xml
rename to transition/src/androidTest/res/transition/custom_path_motion.xml


diff --git a/transition/tests/res/transition/custom_transition.xml b/transition/src/androidTest/res/transition/custom_transition.xml
similarity index 100%
rename from transition/tests/res/transition/custom_transition.xml
rename to transition/src/androidTest/res/transition/custom_transition.xml


diff --git a/transition/tests/res/transition/explode.xml b/transition/src/androidTest/res/transition/explode.xml
similarity index 100%
rename from transition/tests/res/transition/explode.xml
rename to transition/src/androidTest/res/transition/explode.xml


diff --git a/transition/tests/res/transition/fade.xml b/transition/src/androidTest/res/transition/fade.xml
similarity index 100%
rename from transition/tests/res/transition/fade.xml
rename to transition/src/androidTest/res/transition/fade.xml


diff --git a/transition/tests/res/transition/pattern_path_motion.xml b/transition/src/androidTest/res/transition/pattern_path_motion.xml
similarity index 100%
rename from transition/tests/res/transition/pattern_path_motion.xml
rename to transition/src/androidTest/res/transition/pattern_path_motion.xml


diff --git a/transition/tests/res/transition/slide.xml b/transition/src/androidTest/res/transition/slide.xml
similarity index 100%
rename from transition/tests/res/transition/slide.xml
rename to transition/src/androidTest/res/transition/slide.xml


diff --git a/transition/tests/res/transition/target_classes.xml b/transition/src/androidTest/res/transition/target_classes.xml
similarity index 100%
rename from transition/tests/res/transition/target_classes.xml
rename to transition/src/androidTest/res/transition/target_classes.xml


diff --git a/transition/tests/res/transition/target_ids.xml b/transition/src/androidTest/res/transition/target_ids.xml
similarity index 100%
rename from transition/tests/res/transition/target_ids.xml
rename to transition/src/androidTest/res/transition/target_ids.xml


diff --git a/transition/tests/res/transition/target_names.xml b/transition/src/androidTest/res/transition/target_names.xml
similarity index 100%
rename from transition/tests/res/transition/target_names.xml
rename to transition/src/androidTest/res/transition/target_names.xml


diff --git a/transition/tests/res/transition/transition_constructors.xml b/transition/src/androidTest/res/transition/transition_constructors.xml
similarity index 100%
rename from transition/tests/res/transition/transition_constructors.xml
rename to transition/src/androidTest/res/transition/transition_constructors.xml


diff --git a/transition/tests/res/transition/transition_set.xml b/transition/src/androidTest/res/transition/transition_set.xml
similarity index 100%
rename from transition/tests/res/transition/transition_set.xml
rename to transition/src/androidTest/res/transition/transition_set.xml


diff --git a/transition/tests/res/values/strings.xml b/transition/src/androidTest/res/values/strings.xml
similarity index 100%
rename from transition/tests/res/values/strings.xml
rename to transition/src/androidTest/res/values/strings.xml


diff --git a/transition/AndroidManifest.xml b/transition/src/main/AndroidManifest.xml
similarity index 100%
rename from transition/AndroidManifest.xml
rename to transition/src/main/AndroidManifest.xml


diff --git a/transition/res/values/ids.xml b/transition/src/main/res/values/ids.xml
similarity index 100%
rename from transition/res/values/ids.xml
rename to transition/src/main/res/values/ids.xml
commit	d28503ff153296b993cbbbfae4f88d0299045e27	[log] [tgz]
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>	Sun Dec 17 22:18:23 2017 +0000
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>	Sun Dec 17 22:18:23 2017 +0000
tree	32e1108f27eb0efe9530522de56bf2828fa5fe16
parent	cae865a3811a2bfc071351ab7bd3c5b96bf3ff50 [diff]
parent	da292d81f4ca4dd52d3bd06171f94d19eda93341 [diff]