DO NOT MERGE ANYWHERE. update support lib to build id 2050913 from mnc-dev.

Change-Id: I3b9aa609fc5978c3757352e5300f4fc9f12ac3b8

20 files changed, 42 insertions, 66 deletions

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 51a741d..ae3a1a5 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
diff --git a/current/support/v7/appcompat/res/values-v11/styles_base.xml b/current/support/v7/appcompat/res/values-v11/styles_base.xml
index 0bbf7e3..f651320 100644
--- a/current/support/v7/appcompat/res/values-v11/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v11/styles_base.xml
@@ -21,11 +21,7 @@
      variants are for direct use or use as parent styles by the app. -->
     <eat-comment/>
 
-    <style name="Base.Widget.AppCompat.Spinner" parent="android:Widget.Holo.Spinner">
-        <item name="android:background">@drawable/abc_spinner_mtrl_am_alpha</item>
-        <item name="android:dropDownSelector">?attr/listChoiceBackgroundIndicator</item>
-        <item name="android:popupBackground">@drawable/abc_popup_background_mtrl_mult</item>
-    </style>
+    <style name="Platform.Widget.AppCompat.Spinner" parent="android:Widget.Holo.Spinner" />
 
     <!-- Progress Bar -->
 
diff --git a/current/support/v7/appcompat/res/values-v21/styles_base.xml b/current/support/v7/appcompat/res/values-v21/styles_base.xml
index 241cb04..47681f2 100644
--- a/current/support/v7/appcompat/res/values-v21/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/styles_base.xml
@@ -115,12 +115,6 @@
 
     <style name="Base.Widget.AppCompat.Spinner.Underlined" parent="android:Widget.Material.Spinner.Underlined" />
 
-    <style name="Base.Widget.AppCompat.Spinner.DropDown.ActionBar" parent="android:Widget.Material.Spinner">
-        <item name="spinnerMode">dropdown</item>
-        <item name="disableChildrenWhenDisabled">true</item>
-        <item name="popupPromptView">@layout/abc_simple_dropdown_hint</item>
-    </style>
-
     <style name="Base.Widget.AppCompat.ListView" parent="android:Widget.Material.ListView" />
     <style name="Base.Widget.AppCompat.ListView.Menu" />
 
diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml
index c727a2a..9b029d4 100644
--- a/current/support/v7/appcompat/res/values/attrs.xml
+++ b/current/support/v7/appcompat/res/values/attrs.xml
@@ -674,37 +674,13 @@
 
     <declare-styleable name="Spinner">
         <!-- The prompt to display when the spinner's dialog is shown. -->
-        <attr name="prompt" format="reference" />
-        <!-- Display mode for spinner options. -->
-        <attr name="spinnerMode" format="enum">
-            <!-- Spinner options will be presented to the user as a dialog window. -->
-            <enum name="dialog" value="0" />
-            <!-- Spinner options will be presented to the user as an inline dropdown
-                 anchored to the spinner widget itself. -->
-            <enum name="dropdown" value="1" />
-        </attr>
-        <!-- List selector to use for spinnerMode="dropdown" display. -->
-        <attr name="android:dropDownSelector" />
+        <attr name="android:prompt" />
+        <!-- Theme to use for the drop-down or dialog popup window. -->
+        <attr name="popupTheme" />
         <!-- Background drawable to use for the dropdown in spinnerMode="dropdown". -->
         <attr name="android:popupBackground" />
-        <!-- Vertical offset from the spinner widget for positioning the dropdown in
-             spinnerMode="dropdown". -->
-        <attr name="android:dropDownVerticalOffset" />
-        <!-- Horizontal offset from the spinner widget for positioning the dropdown
-             in spinnerMode="dropdown". -->
-        <attr name="android:dropDownHorizontalOffset" />
         <!-- Width of the dropdown in spinnerMode="dropdown". -->
         <attr name="android:dropDownWidth" />
-        <!-- Reference to a layout to use for displaying a prompt in the dropdown for
-             spinnerMode="dropdown". This layout must contain a TextView with the id
-             {@code @android:id/text1} to be populated with the prompt text. -->
-        <attr name="popupPromptView" format="reference" />
-        <!-- Gravity setting for positioning the currently selected item. -->
-        <attr name="android:gravity" />
-        <!-- Whether this spinner should mark child views as enabled/disabled when
-             the spinner itself is enabled/disabled. -->
-        <attr name="disableChildrenWhenDisabled" format="boolean" />
-        <attr name="android:background" />
     </declare-styleable>
 
     <declare-styleable name="SearchView">
diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml
index 1b74fc2..7585d05 100644
--- a/current/support/v7/appcompat/res/values/styles.xml
+++ b/current/support/v7/appcompat/res/values/styles.xml
@@ -121,7 +121,7 @@
 
     <style name="Widget.AppCompat.Spinner.DropDown" />
 
-    <style name="Widget.AppCompat.Spinner.DropDown.ActionBar" parent="Base.Widget.AppCompat.Spinner.DropDown.ActionBar" />
+    <style name="Widget.AppCompat.Spinner.DropDown.ActionBar" />
 
     <!-- This style has an extra indirection to properly set RTL attributes. See styles_rtl.xml -->
     <style name="Widget.AppCompat.DropDownItem.Spinner" parent="RtlOverlay.Widget.AppCompat.Search.DropDown.Text" />
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index 91f51c9..c1cfce1 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -178,30 +178,22 @@
 
     <!-- Spinner Widgets -->
 
-    <style name="Base.Widget.AppCompat.Spinner" parent="android:Widget.Spinner">
-        <item name="android:background">@drawable/abc_spinner_mtrl_am_alpha</item>
-        <item name="android:dropDownSelector">?attr/listChoiceBackgroundIndicator</item>
-        <item name="android:dropDownVerticalOffset">0dip</item>
-    </style>
-
-    <style name="Base.Widget.AppCompat.Spinner.Underlined">
-        <item name="android:background">@drawable/abc_spinner_textfield_background_material</item>
-    </style>
+    <style name="Platform.Widget.AppCompat.Spinner" parent="android:Widget.Spinner" />
 
-    <style name="Base.Widget.AppCompat.Spinner.DropDown.ActionBar" parent="android:Widget">
-        <item name="spinnerMode">dropdown</item>
-
-        <item name="android:clickable">true</item>
+    <style name="Base.Widget.AppCompat.Spinner" parent="Platform.Widget.AppCompat.Spinner">
         <item name="android:background">@drawable/abc_spinner_mtrl_am_alpha</item>
-        <item name="android:dropDownSelector">?attr/listChoiceBackgroundIndicator</item>
         <item name="android:popupBackground">@drawable/abc_popup_background_mtrl_mult</item>
+        <item name="android:dropDownSelector">?attr/listChoiceBackgroundIndicator</item>
         <item name="android:dropDownVerticalOffset">0dip</item>
         <item name="android:dropDownHorizontalOffset">0dip</item>
-        <item name="overlapAnchor">true</item>
         <item name="android:dropDownWidth">wrap_content</item>
-        <item name="popupPromptView">@layout/abc_simple_dropdown_hint</item>
+        <item name="android:clickable">true</item>
         <item name="android:gravity">left|start|center_vertical</item>
-        <item name="disableChildrenWhenDisabled">true</item>
+        <item name="overlapAnchor">true</item>
+    </style>
+
+    <style name="Base.Widget.AppCompat.Spinner.Underlined">
+        <item name="android:background">@drawable/abc_spinner_textfield_background_material</item>
     </style>
 
     <style name="Base.Widget.AppCompat.DropDownItem.Spinner" parent="">
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 547068b..b19ec34 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
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 9e48ed6..5cf40b9 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
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 340d9af..6c0aa2c 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_audio_vol.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_audio_vol.png
deleted file mode 100644
index 17565c5..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_audio_vol.png
+++ /dev/null
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_audio_vol.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_audio_vol.png
deleted file mode 100644
index 36f079d..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_audio_vol.png
+++ /dev/null
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_audio_vol.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_audio_vol.png
deleted file mode 100644
index e0dff4c..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_audio_vol.png
+++ /dev/null
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_audio_vol.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_audio_vol.png
deleted file mode 100755
index 3dd7a68..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_audio_vol.png
+++ /dev/null
diff --git a/current/support/v7/appcompat/res/layout/abc_simple_dropdown_hint.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_cast_dark.xml
index 8326b5c..eaaf9c9 100644
--- a/current/support/v7/appcompat/res/layout/abc_simple_dropdown_hint.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_cast_dark.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,10 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@android:id/text1"
-          android:textAppearance="?android:attr/dropDownHintAppearance"
-          android:singleLine="true"
-          android:layout_margin="3dip"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content" />
\ No newline at end of file
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_cast_dark" />
+</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_cast_light.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_cast_light.xml
new file mode 100644
index 0000000..342c59e
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_cast_light.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_cast_light" />
+</selector>
diff --git a/current/support/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml b/current/support/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
index 5e16057..3c5ffc9 100644
--- a/current/support/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
+++ b/current/support/v7/mediarouter/res/layout/mr_media_route_controller_material_dialog_b.xml
@@ -107,7 +107,7 @@
                       android:visibility="gone">
             <ImageView android:layout_width="48dp"
                        android:layout_height="48dp"
-                       android:src="@drawable/mr_ic_audio_vol"
+                       android:src="?attr/mediaRouteCastDrawable"
                        android:gravity="center"
                        android:scaleType="center" />
             <SeekBar android:id="@+id/media_route_volume_slider"
diff --git a/current/support/v7/mediarouter/res/values/attrs.xml b/current/support/v7/mediarouter/res/values/attrs.xml
index 5cd5606..9f5f8ac 100644
--- a/current/support/v7/mediarouter/res/values/attrs.xml
+++ b/current/support/v7/mediarouter/res/values/attrs.xml
@@ -33,4 +33,5 @@
     <attr name="mediaRouteSettingsDrawable" format="reference" />
     <attr name="mediaRoutePlayDrawable" format="reference" />
     <attr name="mediaRoutePauseDrawable" format="reference" />
+    <attr name="mediaRouteCastDrawable" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/current/support/v7/mediarouter/res/values/themes.xml b/current/support/v7/mediarouter/res/values/themes.xml
index 8350e04..85d0a8b 100644
--- a/current/support/v7/mediarouter/res/values/themes.xml
+++ b/current/support/v7/mediarouter/res/values/themes.xml
@@ -25,6 +25,7 @@
         <item name="mediaRouteSettingsDrawable">@drawable/mr_ic_settings_dark</item>
         <item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_dark</item>
         <item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_dark</item>
+        <item name="mediaRouteCastDrawable">@drawable/mr_ic_cast_dark</item>
     </style>
 
     <style name="Theme.MediaRouter.Light" parent="">
@@ -36,6 +37,7 @@
         <item name="mediaRouteSettingsDrawable">@drawable/mr_ic_settings_light</item>
         <item name="mediaRoutePlayDrawable">@drawable/mr_ic_play_light</item>
         <item name="mediaRoutePauseDrawable">@drawable/mr_ic_pause_light</item>
+        <item name="mediaRouteCastDrawable">@drawable/mr_ic_cast_light</item>
     </style>
 
 </resources>
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 5d73ae7..78e3036 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
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 05983a4..2c4af25 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar