DO NOT MERGE ANYWHERE.
Update support library @ 2322615 from mnc-ub-dev. Almost-RC!
Change-Id: I2629e6b7c8fce66f448126550b75b67a2bc21821
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 518e12e..5bfdc60 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/customtabs/libs/android-support-customtabs.jar b/current/support/customtabs/libs/android-support-customtabs.jar
index 0d15bcb..501d62e 100644
--- a/current/support/customtabs/libs/android-support-customtabs.jar
+++ b/current/support/customtabs/libs/android-support-customtabs.jar
Binary files differ
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index e96be86..3159bae 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
Binary files differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 16f472a..c747335 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index bf94f7a..1afb7d1 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
Binary files differ
diff --git a/current/support/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar
index 9f4d410..66d260b 100644
--- a/current/support/percent/libs/android-support-percent.jar
+++ b/current/support/percent/libs/android-support-percent.jar
Binary files differ
diff --git a/current/support/recommendation/libs/android-support-recommendation.jar b/current/support/recommendation/libs/android-support-recommendation.jar
index e02c5a5..2b112a1 100644
--- a/current/support/recommendation/libs/android-support-recommendation.jar
+++ b/current/support/recommendation/libs/android-support-recommendation.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 03c184d..01970ea 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
Binary files differ
diff --git a/current/support/v14/preference/libs/android-support-v14-preference.jar b/current/support/v14/preference/libs/android-support-v14-preference.jar
index 8536e08..59812af 100644
--- a/current/support/v14/preference/libs/android-support-v14-preference.jar
+++ b/current/support/v14/preference/libs/android-support-v14-preference.jar
Binary files differ
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 32b7a9a..c7f1819 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
index 3e072fa..ea62600 100644
--- a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
+++ b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
Binary files differ
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index 681f425..09172b8 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index 57cfd63..7e58e52 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index fe84166..44003a1 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index 54a7349..de6ef76 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index 9e8138b..3651829 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml
new file mode 100644
index 0000000..54f348c
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the copy of @drawable/abc_dialog_material_background_dark except for inset
+ which includes unnecessary padding. -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="2dp" />
+ <solid android:color="@color/background_floating_material_dark" />
+</shape>
\ No newline at end of file
diff --git a/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml
new file mode 100644
index 0000000..b5d82af
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the copy of @drawable/abc_dialog_material_background_light except for inset
+ which includes unnecessary padding. -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="2dp" />
+ <solid android:color="@color/background_floating_material_light" />
+</shape>
\ No newline at end of file
diff --git a/current/support/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml b/current/support/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml
index 232eeae..5ee1275 100644
--- a/current/support/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml
+++ b/current/support/v7/mediarouter/res/layout/mr_controller_material_dialog_b.xml
@@ -22,7 +22,7 @@
<LinearLayout android:id="@+id/mr_dialog_area"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?android:attr/windowBackground"
+ android:background="?attr/MediaRouteControllerWindowBackground"
android:layout_gravity="center"
android:orientation="vertical">
<LinearLayout android:id="@+id/mr_title_bar"
diff --git a/current/support/v7/mediarouter/res/values/attrs.xml b/current/support/v7/mediarouter/res/values/attrs.xml
index cd6e95b..798f427 100644
--- a/current/support/v7/mediarouter/res/values/attrs.xml
+++ b/current/support/v7/mediarouter/res/values/attrs.xml
@@ -26,6 +26,7 @@
<attr name="android:minHeight" />
</declare-styleable>
+ <attr name="MediaRouteControllerWindowBackground" format="reference" />
<attr name="mediaRouteButtonStyle" format="reference" />
<attr name="mediaRouteOffDrawable" format="reference" />
<attr name="mediaRouteConnectingDrawable" format="reference" />
diff --git a/current/support/v7/mediarouter/res/values/themes.xml b/current/support/v7/mediarouter/res/values/themes.xml
index 3890199..5b32347 100644
--- a/current/support/v7/mediarouter/res/values/themes.xml
+++ b/current/support/v7/mediarouter/res/values/themes.xml
@@ -20,6 +20,7 @@
<item name="android:windowNoTitle">false</item>
<item name="mediaRouteButtonStyle">@style/Widget.MediaRouter.MediaRouteButton</item>
+ <item name="MediaRouteControllerWindowBackground">@drawable/mr_dialog_material_background_dark</item>
<item name="mediaRouteOffDrawable">@drawable/ic_media_route_off_mono_dark</item>
<item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_dark</item>
<item name="mediaRouteOnDrawable">@drawable/ic_media_route_on_mono_dark</item>
@@ -51,6 +52,7 @@
<style name="Theme.MediaRouter.Light">
<item name="mediaRouteButtonStyle">@style/Widget.MediaRouter.Light.MediaRouteButton</item>
+ <item name="MediaRouteControllerWindowBackground">@drawable/mr_dialog_material_background_light</item>
<item name="mediaRouteOffDrawable">@drawable/ic_cast_off_light</item>
<item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_light</item>
<item name="mediaRouteOnDrawable">@drawable/ic_cast_on_light</item>
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index c136b58..408b3c0 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/preference/libs/android-support-v7-preference.jar b/current/support/v7/preference/libs/android-support-v7-preference.jar
index 01492ff..d2b159f 100644
--- a/current/support/v7/preference/libs/android-support-v7-preference.jar
+++ b/current/support/v7/preference/libs/android-support-v7-preference.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index c4d9b65..e02d678 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
