resolve merge conflicts of 7de2a8daab5cdfa33798d66de27b542472cf1de1 to androidx-camerax-dev

Bug: None
Test: ./gradlew -p . --no-daemon buildOnServer

Change-Id: Ib75feabd761aa8fd75a0e1329367ef88691c0c14

diff --git a/media/build.gradle b/media/build.gradle
index 8f04a69..26e120a 100644
--- a/media/build.gradle
+++ b/media/build.gradle

@@ -7,10 +7,8 @@
 }
 
 dependencies {
-    api(project(":annotation"))
     api(project(":core"))
-    implementation(project(":collection"))
-    api("androidx.versionedparcelable:versionedparcelable:1.1.0-alpha01")
+    implementation("androidx.collection:collection:1.0.0")
 
     androidTestImplementation(TEST_EXT_JUNIT)
     androidTestImplementation(TEST_CORE)

diff --git a/media2-widget/build.gradle b/media2-widget/build.gradle
index a26131a..7620fbd 100644
--- a/media2-widget/build.gradle
+++ b/media2-widget/build.gradle

@@ -25,9 +25,8 @@
 dependencies {
     api(project(":media2"))
     api(project(":mediarouter"))
-    // TODO: change to 1.1.0-alpha03 after release
-    api(project(":appcompat"))
-    api("androidx.palette:palette:1.0.0")
+    implementation("androidx.appcompat:appcompat:1.0.2")
+    implementation("androidx.palette:palette:1.0.0")
     implementation(project(":concurrent:concurrent-futures"))
 
     androidTestImplementation(TEST_EXT_JUNIT)

diff --git a/media2/build.gradle b/media2/build.gradle
index 9c4a928..d3afeab 100644
--- a/media2/build.gradle
+++ b/media2/build.gradle

@@ -9,10 +9,9 @@
 
 dependencies {
     api(project(":media"))
-    api('androidx.versionedparcelable:versionedparcelable:1.1.0-alpha01')
     api(GUAVA_LISTENABLE_FUTURE)
     implementation(project(":concurrent:concurrent-futures"))
-    implementation(project(":collection"))
+    implementation("androidx.collection:collection:1.0.0")
     compileOnly(CHECKER_FRAMEWORK)
     // Depend on media2-exoplayer so that the library groupId is set to match media2.
     implementation(project(":media2-exoplayer"))

diff --git a/mediarouter/build.gradle b/mediarouter/build.gradle
index 213f9cd..3f6f6ec 100644
--- a/mediarouter/build.gradle
+++ b/mediarouter/build.gradle

@@ -8,9 +8,9 @@
 
 dependencies {
     api(project(":media"))
-    api(project(":appcompat"))
-    api("androidx.palette:palette:1.0.0")
-    api(project(":recyclerview"))
+    implementation("androidx.appcompat:appcompat:1.0.2")
+    implementation("androidx.palette:palette:1.0.0")
+    implementation(project(":recyclerview"))
 
     androidTestImplementation(TEST_EXT_JUNIT)
     androidTestImplementation(TEST_CORE)

diff --git a/mediarouter/lint-baseline.xml b/mediarouter/lint-baseline.xml
index 787c098..2a350cc 100644
--- a/mediarouter/lint-baseline.xml
+++ b/mediarouter/lint-baseline.xml

@@ -23,4 +23,15 @@
             column="19"/>
     </issue>
 
+    <issue
+        id="AppCompatCustomView"
+        message="This custom view should extend `android.support.v7.widget.AppCompatImageButton` instead"
+        errorLine1="class MediaRouteExpandCollapseButton extends ImageButton {"
+        errorLine2="                                             ~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java"
+            line="34"
+            column="46"/>
+    </issue>
+
 </issues>

diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index 7e4eabe..26545a6 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle

@@ -19,5 +19,7 @@
     }
     lintOptions {
         disable "WrongThread"
+        // TODO: Enable lint after appcompat:1.1.0 release or use lint-baseline.xml instead.
+        abortOnError false
     }
 }

diff --git a/samples/SupportMediaDemos/build.gradle b/samples/SupportMediaDemos/build.gradle
index c3c990b..ef5cd97 100644
--- a/samples/SupportMediaDemos/build.gradle
+++ b/samples/SupportMediaDemos/build.gradle

@@ -21,6 +21,7 @@
 
 dependencies {
     implementation(project(":media2-widget"))
+    implementation("androidx.appcompat:appcompat:1.0.2")
     implementation(project(":core"))
 }