Megamove of source directories.
Move source code to more standard src/main/java style directories.
Bug: 67054326
Test: ./gradlew assembleDebug
Change-Id: I7db70a3815246ea5a5f0864bbf36a01a956138a3
Merged-In: I7db70a3815246ea5a5f0864bbf36a01a956138a3
diff --git a/tv-provider/Android.mk b/tv-provider/Android.mk
index 4fa8af4..9427d0d 100644
--- a/tv-provider/Android.mk
+++ b/tv-provider/Android.mk
@@ -23,7 +23,7 @@
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-tv-provider
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SHARED_ANDROID_LIBRARIES := \
android-support-compat \
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 42d2d90..0545458 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -11,11 +11,6 @@
defaultConfig {
minSdkVersion 21
}
-
- sourceSets {
- main.java.srcDirs = ['src']
- main.res.srcDir 'res'
- }
}
supportLibrary {
diff --git a/tv-provider/lint-baseline.xml b/tv-provider/lint-baseline.xml
index d5fde3a..9814796 100644
--- a/tv-provider/lint-baseline.xml
+++ b/tv-provider/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha9">
+<issues format="4" by="lint 3.0.0-beta6">
<issue
id="WrongConstant"
@@ -7,8 +7,8 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/BasePreviewProgram.java"
- line="129"
+ file="src/main/java/android/support/media/tv/BasePreviewProgram.java"
+ line="130"
column="28"/>
</issue>
@@ -18,8 +18,8 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/BasePreviewProgram.java"
- line="139"
+ file="src/main/java/android/support/media/tv/BasePreviewProgram.java"
+ line="140"
column="28"/>
</issue>
@@ -29,8 +29,8 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/BasePreviewProgram.java"
- line="149"
+ file="src/main/java/android/support/media/tv/BasePreviewProgram.java"
+ line="150"
column="28"/>
</issue>
@@ -40,8 +40,8 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/BasePreviewProgram.java"
- line="167"
+ file="src/main/java/android/support/media/tv/BasePreviewProgram.java"
+ line="168"
column="28"/>
</issue>
@@ -51,8 +51,8 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/BasePreviewProgram.java"
- line="218"
+ file="src/main/java/android/support/media/tv/BasePreviewProgram.java"
+ line="219"
column="28"/>
</issue>
@@ -62,7 +62,7 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/BaseProgram.java"
+ file="src/main/java/android/support/media/tv/BaseProgram.java"
line="257"
column="28"/>
</issue>
@@ -73,7 +73,7 @@
errorLine1=" mValues.put(Programs.COLUMN_BROADCAST_GENRE, Programs.Genres.encode(genres));"
errorLine2=" ~~~~~~">
<location
- file="src/android/support/media/tv/Program.java"
+ file="src/main/java/android/support/media/tv/Program.java"
line="286"
column="81"/>
</issue>
@@ -84,7 +84,7 @@
errorLine1=" return i == null ? INVALID_INT_VALUE : i;"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
- file="src/android/support/media/tv/WatchNextProgram.java"
+ file="src/main/java/android/support/media/tv/WatchNextProgram.java"
line="99"
column="28"/>
</issue>
diff --git a/tv-provider/src/android/support/media/tv/BasePreviewProgram.java b/tv-provider/src/main/java/android/support/media/tv/BasePreviewProgram.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/BasePreviewProgram.java
rename to tv-provider/src/main/java/android/support/media/tv/BasePreviewProgram.java
diff --git a/tv-provider/src/android/support/media/tv/BaseProgram.java b/tv-provider/src/main/java/android/support/media/tv/BaseProgram.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/BaseProgram.java
rename to tv-provider/src/main/java/android/support/media/tv/BaseProgram.java
diff --git a/tv-provider/src/android/support/media/tv/Channel.java b/tv-provider/src/main/java/android/support/media/tv/Channel.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/Channel.java
rename to tv-provider/src/main/java/android/support/media/tv/Channel.java
diff --git a/tv-provider/src/android/support/media/tv/ChannelLogoUtils.java b/tv-provider/src/main/java/android/support/media/tv/ChannelLogoUtils.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/ChannelLogoUtils.java
rename to tv-provider/src/main/java/android/support/media/tv/ChannelLogoUtils.java
diff --git a/tv-provider/src/android/support/media/tv/CollectionUtils.java b/tv-provider/src/main/java/android/support/media/tv/CollectionUtils.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/CollectionUtils.java
rename to tv-provider/src/main/java/android/support/media/tv/CollectionUtils.java
diff --git a/tv-provider/src/android/support/media/tv/PreviewProgram.java b/tv-provider/src/main/java/android/support/media/tv/PreviewProgram.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/PreviewProgram.java
rename to tv-provider/src/main/java/android/support/media/tv/PreviewProgram.java
diff --git a/tv-provider/src/android/support/media/tv/Program.java b/tv-provider/src/main/java/android/support/media/tv/Program.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/Program.java
rename to tv-provider/src/main/java/android/support/media/tv/Program.java
diff --git a/tv-provider/src/android/support/media/tv/TvContractCompat.java b/tv-provider/src/main/java/android/support/media/tv/TvContractCompat.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/TvContractCompat.java
rename to tv-provider/src/main/java/android/support/media/tv/TvContractCompat.java
diff --git a/tv-provider/src/android/support/media/tv/TvContractUtils.java b/tv-provider/src/main/java/android/support/media/tv/TvContractUtils.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/TvContractUtils.java
rename to tv-provider/src/main/java/android/support/media/tv/TvContractUtils.java
diff --git a/tv-provider/src/android/support/media/tv/WatchNextProgram.java b/tv-provider/src/main/java/android/support/media/tv/WatchNextProgram.java
similarity index 100%
rename from tv-provider/src/android/support/media/tv/WatchNextProgram.java
rename to tv-provider/src/main/java/android/support/media/tv/WatchNextProgram.java