Merge "Remove VIA methods that are hidden in API version 23." into mnc-dev
diff --git a/api/23.txt b/api/23.txt
index 6fb3c29..3b6a6a4 100644
--- a/api/23.txt
+++ b/api/23.txt
@@ -134,7 +134,6 @@
public static final class Manifest.permission_group {
ctor public Manifest.permission_group();
- field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 5721048..ef3c648 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/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index 2ccacee..b49f0e1 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/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index 9702497..2dfeb41 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -172,6 +172,9 @@
<declare-styleable name="AppBarLayout">
<attr name="elevation" />
<attr name="android:background" />
+ <!-- The initial expanded state for the AppBarLayout. This only takes effect when this
+ view is a direct child of a CoordinatorLayout. -->
+ <attr name="expanded" format="boolean" />
</declare-styleable>
<declare-styleable name="AppBarLayout_LayoutParams">
@@ -239,6 +242,54 @@
<!-- The id of the primary Toolbar child that you wish to use for the purpose of collapsing.
If you do not set this then the first Toolbar child found will be used. -->
<attr name="toolbarId" format="reference"/>
+
+ <!-- Specifies how the title should be positioned when collapsed. -->
+ <attr name="collapsedTitleGravity">
+ <!-- Push title to the top of its container, not changing its size. -->
+ <flag name="top" value="0x30"/>
+ <!-- Push title to the bottom of its container, not changing its size. -->
+ <flag name="bottom" value="0x50"/>
+ <!-- Push title to the left of its container, not changing its size. -->
+ <flag name="left" value="0x03"/>
+ <!-- Push title to the right of its container, not changing its size. -->
+ <flag name="right" value="0x05"/>
+ <!-- Place title in the vertical center of its container, not changing its size. -->
+ <flag name="center_vertical" value="0x10"/>
+ <!-- Grow the vertical size of the title if needed so it completely fills its container. -->
+ <flag name="fill_vertical" value="0x70"/>
+ <!-- Place title in the horizontal center of its container, not changing its size. -->
+ <flag name="center_horizontal" value="0x01"/>
+ <!-- Place the title in the center of its container in both the vertical and horizontal axis, not changing its size. -->
+ <flag name="center" value="0x11"/>
+ <!-- Push title to the beginning of its container, not changing its size. -->
+ <flag name="start" value="0x00800003"/>
+ <!-- Push title to the end of its container, not changing its size. -->
+ <flag name="end" value="0x00800005"/>
+ </attr>
+
+ <!-- Specifies how the title should be positioned when expanded. -->
+ <attr name="expandedTitleGravity">
+ <!-- Push title to the top of its container, not changing its size. -->
+ <flag name="top" value="0x30"/>
+ <!-- Push title to the bottom of its container, not changing its size. -->
+ <flag name="bottom" value="0x50"/>
+ <!-- Push title to the left of its container, not changing its size. -->
+ <flag name="left" value="0x03"/>
+ <!-- Push title to the right of its container, not changing its size. -->
+ <flag name="right" value="0x05"/>
+ <!-- Place title in the vertical center of its container, not changing its size. -->
+ <flag name="center_vertical" value="0x10"/>
+ <!-- Grow the vertical size of the title if needed so it completely fills its container. -->
+ <flag name="fill_vertical" value="0x70"/>
+ <!-- Place title in the horizontal center of its container, not changing its size. -->
+ <flag name="center_horizontal" value="0x01"/>
+ <!-- Place the title in the center of its container in both the vertical and horizontal axis, not changing its size. -->
+ <flag name="center" value="0x11"/>
+ <!-- Push title to the beginning of its container, not changing its size. -->
+ <flag name="start" value="0x00800003"/>
+ <!-- Push title to the end of its container, not changing its size. -->
+ <flag name="end" value="0x00800005"/>
+ </attr>
</declare-styleable>
<declare-styleable name="CollapsingAppBarLayout_LayoutParams">
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 bb86230..9c044b1 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 4247726..af7c4f1 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 fa21886..ddd9a91 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/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 8b370db..1279883 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/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 2ae40dc..c66f40c 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/leanback/res/layout/lb_fullwidth_details_overview.xml b/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml
index 27c4258..614fc59 100644
--- a/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml
+++ b/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml
@@ -30,7 +30,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/lb_details_v2_card_height"
android:layout_marginTop="@dimen/lb_details_v2_blank_height"
- android:paddingStart="@dimen/lb_details_v2_left"
android:clipToPadding="false"
android:foreground="#ffffff"
android:elevation="@dimen/lb_details_overview_z"
@@ -42,34 +41,40 @@
android:orientation="vertical"
>
- <android.support.v17.leanback.widget.HorizontalGridView
- android:id="@+id/details_overview_actions"
- android:layout_width="match_parent"
- android:layout_height="@dimen/lb_details_v2_actions_height"
- android:gravity="center"
- android:clipToPadding="false"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:paddingStart="@dimen/lb_details_v2_description_margin_start"
- android:paddingEnd="@dimen/lb_details_v2_description_margin_end"
- lb:horizontalMargin="@dimen/lb_details_overview_action_items_margin"
- lb:rowHeight="@dimen/lb_details_v2_actions_height" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/details_overview_actions_background"
+ android:orientation="vertical" >
- <android.support.v17.leanback.widget.NonOverlappingFrameLayout
- android:id="@+id/details_overview_description"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:descendantFocusability="afterDescendants"
- android:gravity="top"
- android:paddingStart="@dimen/lb_details_v2_description_margin_start"
- android:paddingEnd="@dimen/lb_details_v2_description_margin_end"
- android:paddingTop="@dimen/lb_details_v2_description_margin_top"
- android:clipToPadding="false"
- android:clipChildren="false"
- />
+ <android.support.v17.leanback.widget.HorizontalGridView
+ android:id="@+id/details_overview_actions"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/lb_details_v2_actions_height"
+ android:gravity="center"
+ android:clipToPadding="false"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:paddingStart="@dimen/lb_details_v2_description_margin_start"
+ android:paddingEnd="@dimen/lb_details_v2_description_margin_end"
+ lb:horizontalMargin="@dimen/lb_details_overview_action_items_margin"
+ lb:rowHeight="@dimen/lb_details_v2_actions_height" />
+ </LinearLayout>
+ <android.support.v17.leanback.widget.NonOverlappingFrameLayout
+ android:id="@+id/details_overview_description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:descendantFocusability="afterDescendants"
+ android:gravity="top"
+ android:paddingStart="@dimen/lb_details_v2_description_margin_start"
+ android:paddingEnd="@dimen/lb_details_v2_description_margin_end"
+ android:paddingTop="@dimen/lb_details_v2_description_margin_top"
+ android:clipToPadding="false"
+ android:clipChildren="false"
+ />
</LinearLayout>
</FrameLayout>
</FrameLayout>
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index c7664b9..275612e 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -105,6 +105,7 @@
<dimen name="lb_details_v2_blank_height">160dp</dimen>
<dimen name="lb_details_v2_card_height">540dp</dimen>
<dimen name="lb_details_v2_left">270dip</dimen>
+ <dimen name="lb_details_v2_logo_margin_start">128dp</dimen>
<dimen name="lb_details_v2_actions_height">56dip</dimen>
<dimen name="lb_details_v2_description_margin_start">24dp</dimen>
<dimen name="lb_details_v2_description_margin_end">54dp</dimen>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index 6a60f9f..431b748 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 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
Binary files differ
diff --git a/current/support/v7/appcompat/res/layout/abc_simple_dropdown_hint.xml b/current/support/v7/appcompat/res/layout/abc_simple_dropdown_hint.xml
deleted file mode 100644
index 8326b5c..0000000
--- a/current/support/v7/appcompat/res/layout/abc_simple_dropdown_hint.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 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.
--->
-<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
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,32 +178,24 @@
<!-- Spinner Widgets -->
- <style name="Base.Widget.AppCompat.Spinner" parent="android:Widget.Spinner">
+ <style name="Platform.Widget.AppCompat.Spinner" parent="android:Widget.Spinner" />
+
+ <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: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="android:dropDownWidth">wrap_content</item>
+ <item name="android:clickable">true</item>
+ <item name="android:gravity">left|start|center_vertical</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.Spinner.DropDown.ActionBar" parent="android:Widget">
- <item name="spinnerMode">dropdown</item>
-
- <item name="android:clickable">true</item>
- <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: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:gravity">left|start|center_vertical</item>
- <item name="disableChildrenWhenDisabled">true</item>
- </style>
-
<style name="Base.Widget.AppCompat.DropDownItem.Spinner" parent="">
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Widget.DropDownItem</item>
<item name="android:paddingLeft">8dp</item>
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
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 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
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 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_cast_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_cast_dark.xml
new file mode 100644
index 0000000..eaaf9c9
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_cast_dark.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_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
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 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
Binary files differ
diff --git a/system-api/23.txt b/system-api/23.txt
index 8cfbb2a..1106856 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -217,7 +217,6 @@
public static final class Manifest.permission_group {
ctor public Manifest.permission_group();
- field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";
@@ -30108,7 +30107,6 @@
method public void silenceRinger();
method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
- field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
diff --git a/system_current/android.jar b/system_current/android.jar
index 78cd75e..822dd4c 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ
diff --git a/tools/jack b/tools/jack
index 82eedbd..d201efe 100755
--- a/tools/jack
+++ b/tools/jack
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# v 1.1-rc4
+# Version: 1.1
#
set -o nounset
umask 077
diff --git a/tools/jack-admin b/tools/jack-admin
index ea0d04a..b35d769 100755
--- a/tools/jack-admin
+++ b/tools/jack-admin
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# v 1.1-rc4
+# Version: 1.1
#
set -o nounset
umask 077
diff --git a/tools/jack-launcher.jar b/tools/jack-launcher.jar
index 6e86a10..c90af6e 100644
--- a/tools/jack-launcher.jar
+++ b/tools/jack-launcher.jar
Binary files differ
diff --git a/tools/jack.jar b/tools/jack.jar
index 6e9309b..4315daa 100644
--- a/tools/jack.jar
+++ b/tools/jack.jar
Binary files differ
diff --git a/tools/jill.jar b/tools/jill.jar
index 76e82c1..d579a7d 100644
--- a/tools/jill.jar
+++ b/tools/jill.jar
Binary files differ
