Import translations. DO NOT MERGE - Update prebuilt SDK to LMX65
diff --git a/current/android.jar b/current/android.jar
index a171f5c..63f153a 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl
index a5944da..9625d9b 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -98,8 +98,7 @@
parcelable android.view.textservice.SpellCheckerInfo;
parcelable android.view.textservice.SentenceSuggestionsInfo;
parcelable android.view.textservice.SuggestionsInfo;
-parcelable android.service.carriermessaging.MessagePdu;
-parcelable android.service.carriermessaging.CarrierMessagingService.SendSmsResponse;
+parcelable android.service.carrier.MessagePdu;
parcelable android.service.notification.StatusBarNotification;
parcelable android.speech.tts.Voice;
parcelable android.app.usage.UsageEvents;
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index db0bf96..77ad852 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/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 2337cdf..3101eb0 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 c5554b3..25f67cc 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/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 1daf14b..ecad464 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 a9a8d66..9c7a42d 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_title_view.xml b/current/support/v17/leanback/res/layout/lb_title_view.xml
index 516a0f0..e82621e 100644
--- a/current/support/v17/leanback/res/layout/lb_title_view.xml
+++ b/current/support/v17/leanback/res/layout/lb_title_view.xml
@@ -18,8 +18,10 @@
<ImageView
android:id="@+id/browse_badge"
- android:layout_width="@dimen/lb_browse_title_icon_width"
- android:layout_height="@dimen/lb_browse_title_height"
+ android:layout_width="wrap_content"
+ android:maxWidth="@dimen/lb_browse_title_icon_max_width"
+ android:adjustViewBounds="true"
+ android:layout_height="@dimen/lb_browse_title_icon_height"
android:layout_gravity="center_vertical|end"
android:src="@null"
android:visibility="gone"
diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
index 0ba4125..82913d9 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
@@ -24,8 +24,6 @@
<changeBounds
android:interpolator="@android:interpolator/linear_out_slow_in">
</changeBounds>
- <changeTransform
- android:interpolator="@android:interpolator/linear_out_slow_in" />
<changeImageTransform
android:interpolator="@android:interpolator/linear_out_slow_in"/>
</transitionSet>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml
index 54bc52c..ba65d2f 100644
--- a/current/support/v17/leanback/res/values/colors.xml
+++ b/current/support/v17/leanback/res/values/colors.xml
@@ -32,12 +32,11 @@
<color name="lb_error_background_color_opaque">#262626</color>
<color name="lb_error_background_color_translucent">#E6000000</color>
- <color name="lb_error_message_color_on_opaque">#80EEEEEE</color>
- <color name="lb_error_message_color_on_translucent">#80555555</color>
+ <color name="lb_error_message">#80EEEEEE</color>
<color name="lb_action_text_color">#EEEEEE</color>
- <color name="lb_search_bar_text">#FFEEEEEE</color>
+ <color name="lb_search_bar_text">#80EEEEEE</color>
<color name="lb_search_bar_text_speech_mode">#FF444444</color>
<color name="lb_search_bar_hint">#FF888888</color>
<color name="lb_search_bar_hint_speech_mode">#66222222</color>
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index 2d892c9..e0be6eb 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -27,9 +27,8 @@
<dimen name="lb_vertical_grid_padding_bottom">87dp</dimen>
<dimen name="lb_browse_title_height">60dp</dimen>
+ <dimen name="lb_browse_title_icon_max_width">584dp</dimen>
<dimen name="lb_browse_title_icon_height">52dp</dimen>
- <dimen name="lb_browse_title_icon_width">52dp</dimen>
- <dimen name="lb_browse_title_icon_margin_end">52dp</dimen>
<dimen name="lb_browse_title_text_size">44sp</dimen>
<dimen name="lb_browse_title_text_width">584dp</dimen>
@@ -148,7 +147,7 @@
<dimen name="lb_search_bar_padding_start">56dp</dimen>
<dimen name="lb_search_bar_padding_top">27dp</dimen>
- <dimen name="lb_search_bar_text_size">22sp</dimen>
+ <dimen name="lb_search_bar_text_size">18sp</dimen>
<dimen name="lb_search_bar_unfocused_text_size">18sp</dimen>
<dimen name="lb_search_bar_items_layout_margin_top">27dp</dimen>
<dimen name="lb_search_bar_items_width">600dp</dimen>
diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml
index 0256b92..64e216c 100644
--- a/current/support/v17/leanback/res/values/styles.xml
+++ b/current/support/v17/leanback/res/values/styles.xml
@@ -79,7 +79,7 @@
<style name="TextAppearance.Leanback.ErrorMessage">
<item name="android:textSize">@dimen/lb_error_message_text_size</item>
- <item name="android:textColor">@color/lb_error_message_color_on_opaque</item>
+ <item name="android:textColor">@color/lb_error_message</item>
<item name="android:fontFamily">sans-serif</item>
</style>
@@ -110,7 +110,6 @@
</style>
<style name="Widget.Leanback.Title.Icon">
- <item name="android:scaleType">fitEnd</item>
</style>
<!-- HeadersFragment -->
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index 60d7777..c25f1f5 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 70105e7..73b8df4 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 4281fc2..3e49ab5 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 fe775d9..458fc7d 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 410f980..2934932 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/ic_cast_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_dark.png
new file mode 100644
index 0000000..4a3396a
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_light.png
new file mode 100644
index 0000000..20740bc
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_disabled_mono_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_disabled_mono_dark.png
new file mode 100644
index 0000000..07603b5
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_disabled_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_off_mono_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_off_mono_dark.png
new file mode 100644
index 0000000..27e2d4a
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_off_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png
new file mode 100644
index 0000000..3afde73
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_0_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png
new file mode 100644
index 0000000..f4ce1d5
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_1_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png
new file mode 100644
index 0000000..8dcb6e9
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_2_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png
new file mode 100644
index 0000000..5584a13
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_media_route_on_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_pause_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_pause_dark.png
new file mode 100644
index 0000000..337cf0f
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_pause_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_pause_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_pause_light.png
new file mode 100644
index 0000000..ec70ee1
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_pause_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_play_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_play_dark.png
new file mode 100644
index 0000000..b36cf49
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_play_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_play_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_play_light.png
new file mode 100644
index 0000000..2046149
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_play_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_setting_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_setting_dark.png
new file mode 100644
index 0000000..66efe42
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_setting_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_setting_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_setting_light.png
new file mode 100644
index 0000000..a1f4101
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_setting_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_disabled_holo_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_disabled_holo_dark.png
deleted file mode 100644
index e215b96..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_off_holo_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_off_holo_dark.png
deleted file mode 100644
index bb8bec1..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_0_holo_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_0_holo_dark.png
deleted file mode 100644
index 2c1434b..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_0_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_1_holo_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_1_holo_dark.png
deleted file mode 100644
index 1101864..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_1_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_2_holo_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_2_holo_dark.png
deleted file mode 100644
index 8595158..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_2_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_holo_dark.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_holo_dark.png
deleted file mode 100644
index 1565a29..0000000
--- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_dark.png
new file mode 100644
index 0000000..9bee201
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_light.png
new file mode 100644
index 0000000..6b7885c
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_disabled_mono_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_disabled_mono_dark.png
new file mode 100644
index 0000000..a2c68c5
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_disabled_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_off_mono_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_off_mono_dark.png
new file mode 100644
index 0000000..69287b8
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_off_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png
new file mode 100644
index 0000000..cf035c0
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_0_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png
new file mode 100644
index 0000000..247b72f
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_1_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png
new file mode 100644
index 0000000..eaed2f7
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_2_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png
new file mode 100644
index 0000000..77bd8f5
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_media_route_on_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_pause_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_pause_dark.png
new file mode 100644
index 0000000..0842337
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_pause_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_pause_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_pause_light.png
new file mode 100644
index 0000000..affca8b
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_pause_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_play_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_play_dark.png
new file mode 100644
index 0000000..33f08ae
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_play_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_play_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_play_light.png
new file mode 100644
index 0000000..4360c45
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_play_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_setting_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_setting_dark.png
new file mode 100644
index 0000000..28fbc90
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_setting_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_setting_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_setting_light.png
new file mode 100644
index 0000000..5625eed
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_setting_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_disabled_holo_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_disabled_holo_dark.png
deleted file mode 100644
index 52e3a5a..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_off_holo_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_off_holo_dark.png
deleted file mode 100644
index f98c0a8..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_0_holo_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_0_holo_dark.png
deleted file mode 100644
index a6a4bd0..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_0_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_1_holo_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_1_holo_dark.png
deleted file mode 100644
index 2c141ab..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_1_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_2_holo_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_2_holo_dark.png
deleted file mode 100644
index 23442b0..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_2_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_holo_dark.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_holo_dark.png
deleted file mode 100644
index 58ff506..0000000
--- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_dark.png
new file mode 100644
index 0000000..c3649df
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_light.png
new file mode 100644
index 0000000..ed30868
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_disabled_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_disabled_mono_dark.png
new file mode 100644
index 0000000..14652ef
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_disabled_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_off_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_off_mono_dark.png
new file mode 100644
index 0000000..842dfd3
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_off_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png
new file mode 100644
index 0000000..036cb13
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_0_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png
new file mode 100644
index 0000000..dcf61af
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_1_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png
new file mode 100644
index 0000000..16ce334
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_2_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png
new file mode 100644
index 0000000..0b83548
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_media_route_on_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_pause_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_pause_dark.png
new file mode 100644
index 0000000..67abd61
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_pause_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_pause_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_pause_light.png
new file mode 100644
index 0000000..007b3ce
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_pause_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_play_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_play_dark.png
new file mode 100644
index 0000000..6584e28
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_play_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_play_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_play_light.png
new file mode 100644
index 0000000..0975acf
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_play_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_setting_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_setting_dark.png
new file mode 100644
index 0000000..8622345
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_setting_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_setting_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_setting_light.png
new file mode 100644
index 0000000..b142237
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_setting_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_disabled_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_disabled_holo_dark.png
deleted file mode 100644
index 4119cff..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_off_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_off_holo_dark.png
deleted file mode 100644
index fe81128..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_0_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_0_holo_dark.png
deleted file mode 100644
index 1a513c1..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_0_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_1_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_1_holo_dark.png
deleted file mode 100644
index 4c4b624..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_1_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_2_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_2_holo_dark.png
deleted file mode 100644
index cdb2f30..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_2_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_holo_dark.png
deleted file mode 100644
index a19a083..0000000
--- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_dark.png
new file mode 100644
index 0000000..4f2e24c
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_light.png
new file mode 100644
index 0000000..444078d
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_disabled_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_disabled_mono_dark.png
new file mode 100644
index 0000000..95f639a
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_disabled_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_off_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_off_mono_dark.png
new file mode 100644
index 0000000..8164bde
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_off_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png
new file mode 100644
index 0000000..0663290
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_0_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png
new file mode 100644
index 0000000..c9efc4b
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_1_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png
new file mode 100644
index 0000000..398eb39
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_2_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png
new file mode 100644
index 0000000..18d9150
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_media_route_on_mono_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_pause_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_pause_dark.png
new file mode 100644
index 0000000..7077089
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_pause_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_pause_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_pause_light.png
new file mode 100644
index 0000000..24305f1
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_pause_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_play_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_play_dark.png
new file mode 100644
index 0000000..f65aa13
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_play_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_play_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_play_light.png
new file mode 100644
index 0000000..00af328
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_play_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_setting_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_setting_dark.png
new file mode 100644
index 0000000..7fef5f5
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_setting_dark.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_setting_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_setting_light.png
new file mode 100644
index 0000000..b5085b1
--- /dev/null
+++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_setting_light.png
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_disabled_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_disabled_holo_dark.png
deleted file mode 100644
index 6fad4a6..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_off_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_off_holo_dark.png
deleted file mode 100644
index 44d98d5..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_0_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_0_holo_dark.png
deleted file mode 100644
index c807b50..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_0_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_1_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_1_holo_dark.png
deleted file mode 100644
index d54f44a..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_1_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_2_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_2_holo_dark.png
deleted file mode 100644
index 17c1d99..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_2_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_holo_dark.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_holo_dark.png
deleted file mode 100644
index 906401e..0000000
--- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_holo_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
similarity index 67%
rename from current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_holo_dark.xml
rename to current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
index 6b27536..2d593c3 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_holo_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_dark.xml
@@ -17,8 +17,8 @@
<animation-list
xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
- <item android:drawable="@drawable/mr_ic_media_route_on_0_holo_dark" android:duration="500" />
- <item android:drawable="@drawable/mr_ic_media_route_on_1_holo_dark" android:duration="500" />
- <item android:drawable="@drawable/mr_ic_media_route_on_2_holo_dark" android:duration="500" />
- <item android:drawable="@drawable/mr_ic_media_route_on_1_holo_dark" android:duration="500" />
+ <item android:drawable="@drawable/ic_media_route_on_0_mono_dark" android:duration="500" />
+ <item android:drawable="@drawable/ic_media_route_on_1_mono_dark" android:duration="500" />
+ <item android:drawable="@drawable/ic_media_route_on_2_mono_dark" android:duration="500" />
+ <item android:drawable="@drawable/ic_media_route_on_1_mono_dark" android:duration="500" />
</animation-list>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml
similarity index 79%
rename from current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
rename to current/support/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml
index 6870591..6ae3b0b 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_mono_dark.xml
@@ -16,10 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_holo_dark" />
+ android:drawable="@drawable/ic_media_route_on_mono_dark" />
<item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_holo_dark" />
+ android:drawable="@drawable/mr_ic_media_route_connecting_mono_dark" />
<item android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_off_holo_dark" />
- <item android:drawable="@drawable/mr_ic_media_route_disabled_holo_dark" />
+ android:drawable="@drawable/ic_media_route_off_mono_dark" />
+ <item android:drawable="@drawable/ic_media_route_disabled_mono_dark" />
</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_pause_dark.xml
similarity index 60%
copy from current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
copy to current/support/v7/mediarouter/res/drawable/mr_ic_pause_dark.xml
index 6870591..f3dc712 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_pause_dark.xml
@@ -15,11 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_holo_dark" />
- <item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_holo_dark" />
- <item android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_off_holo_dark" />
- <item android:drawable="@drawable/mr_ic_media_route_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_pause_dark" />
</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_pause_light.xml
similarity index 60%
copy from current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
copy to current/support/v7/mediarouter/res/drawable/mr_ic_pause_light.xml
index 6870591..9702be8 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_pause_light.xml
@@ -15,11 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_holo_dark" />
- <item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_holo_dark" />
- <item android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_off_holo_dark" />
- <item android:drawable="@drawable/mr_ic_media_route_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_pause_light" />
</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_play_dark.xml
similarity index 60%
copy from current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
copy to current/support/v7/mediarouter/res/drawable/mr_ic_play_dark.xml
index 6870591..99e743c 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_play_dark.xml
@@ -15,11 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_holo_dark" />
- <item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_holo_dark" />
- <item android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_off_holo_dark" />
- <item android:drawable="@drawable/mr_ic_media_route_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_play_dark" />
</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_play_light.xml
similarity index 60%
copy from current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
copy to current/support/v7/mediarouter/res/drawable/mr_ic_play_light.xml
index 6870591..d18cc12 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_play_light.xml
@@ -15,11 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_on_holo_dark" />
- <item android:state_checkable="true" android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_connecting_holo_dark" />
- <item android:state_enabled="true"
- android:drawable="@drawable/mr_ic_media_route_off_holo_dark" />
- <item android:drawable="@drawable/mr_ic_media_route_disabled_holo_dark" />
+ <item android:drawable="@drawable/ic_play_light" />
</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml
index d80e0ec..0fe662e 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_settings_dark.xml
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/mr_ic_media_route_on_holo_dark" />
+ <item android:drawable="@drawable/ic_setting_dark" />
</selector>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_settings_light.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_settings_light.xml
index 4fc897a..a4614f6 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_ic_settings_light.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_ic_settings_light.xml
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/mr_ic_media_route_on_holo_light" />
+ <item android:drawable="@drawable/ic_setting_light" />
</selector>
diff --git a/current/support/v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml b/current/support/v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml
deleted file mode 100644
index b45fd15..0000000
--- a/current/support/v7/mediarouter/res/layout-v11/mr_media_route_controller_dialog.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="middle">
- <!-- Optional volume slider section. -->
- <LinearLayout android:id="@+id/media_route_volume_layout"
- android:layout_width="fill_parent"
- android:layout_height="64dp"
- android:gravity="center_vertical"
- android:padding="8dp"
- android:visibility="gone">
- <ImageView android:layout_width="48dp"
- android:layout_height="48dp"
- android:src="@drawable/mr_ic_audio_vol"
- android:gravity="center"
- android:scaleType="center" />
- <SeekBar android:id="@+id/media_route_volume_slider"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp" />
- </LinearLayout>
-
- <!-- Optional content view section. -->
- <FrameLayout android:id="@+id/media_route_control_frame"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:visibility="gone" />
-
- <!-- Disconnect button. -->
- <LinearLayout android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- style="?attr/buttonBarStyle">
- <Button android:id="@+id/media_route_disconnect_button"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- style="?attr/buttonBarButtonStyle"
- android:gravity="center"
- android:text="@string/mr_media_route_controller_disconnect" />
- </LinearLayout>
-</LinearLayout>
diff --git a/current/support/v7/mediarouter/res/values/attrs.xml b/current/support/v7/mediarouter/res/values/attrs.xml
index 14c6204..5cd5606 100644
--- a/current/support/v7/mediarouter/res/values/attrs.xml
+++ b/current/support/v7/mediarouter/res/values/attrs.xml
@@ -31,4 +31,6 @@
<attr name="mediaRouteConnectingDrawable" format="reference" />
<attr name="mediaRouteOnDrawable" format="reference" />
<attr name="mediaRouteSettingsDrawable" format="reference" />
+ <attr name="mediaRoutePlayDrawable" format="reference" />
+ <attr name="mediaRoutePauseDrawable" format="reference" />
</resources>
\ No newline at end of file
diff --git a/current/support/v7/mediarouter/res/values/styles.xml b/current/support/v7/mediarouter/res/values/styles.xml
index fc6b411..500b0d9 100644
--- a/current/support/v7/mediarouter/res/values/styles.xml
+++ b/current/support/v7/mediarouter/res/values/styles.xml
@@ -22,7 +22,7 @@
<item name="android:padding">0dp</item>
<item name="android:focusable">true</item>
<item name="android:contentDescription">@string/mr_media_route_button_content_description</item>
- <item name="externalRouteEnabledDrawable">@drawable/mr_ic_media_route_holo_dark</item>
+ <item name="externalRouteEnabledDrawable">@drawable/mr_ic_media_route_mono_dark</item>
</style>
<style name="Widget.MediaRouter.Light.MediaRouteButton"
diff --git a/current/support/v7/mediarouter/res/values/themes.xml b/current/support/v7/mediarouter/res/values/themes.xml
index c258a11..2eb4cc6 100644
--- a/current/support/v7/mediarouter/res/values/themes.xml
+++ b/current/support/v7/mediarouter/res/values/themes.xml
@@ -19,10 +19,12 @@
<style name="Theme.MediaRouter" parent="">
<item name="mediaRouteButtonStyle">@style/Widget.MediaRouter.MediaRouteButton</item>
- <item name="mediaRouteOffDrawable">@drawable/mr_ic_media_route_off_holo_dark</item>
- <item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_holo_dark</item>
- <item name="mediaRouteOnDrawable">@drawable/mr_ic_media_route_on_holo_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_cast_dark</item>
<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>
</style>
<style name="Theme.MediaRouter.Light" parent="">
@@ -30,8 +32,10 @@
<item name="mediaRouteOffDrawable">@drawable/mr_ic_media_route_off_holo_light</item>
<item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_holo_light</item>
- <item name="mediaRouteOnDrawable">@drawable/mr_ic_media_route_on_holo_light</item>
+ <item name="mediaRouteOnDrawable">@drawable/ic_cast_light</item>
<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>
</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 d19e736..f9a6de3 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 9583b9b..999c6c6 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/current/uiautomator.jar b/current/uiautomator.jar
index b0ffe4b..b082657 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/system_current/android.jar b/system_current/android.jar
index 88a2787..d4314f8 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt
index ff2f67f..c35fc66 100755
--- a/tools/linux/aapt
+++ b/tools/linux/aapt
Binary files differ
