diff options
| author | Qiwen Zhao <zhao@google.com> | 2014-12-10 09:01:08 -0800 |
|---|---|---|
| committer | Qiwen Zhao <zhao@google.com> | 2014-12-10 09:01:08 -0800 |
| commit | a56fdf543e7865d22d5613aea2d491b4462ea6c4 (patch) | |
| tree | 62c7f9f375d4bf6b657c7b6376b0fc4dc68a0676 /current/support | |
| parent | 7551aa1ad5c79c1e9cd2cb405f3e70d6f5f62f70 (diff) | |
| download | prebuilts_sdk-a56fdf543e7865d22d5613aea2d491b4462ea6c4.zip prebuilts_sdk-a56fdf543e7865d22d5613aea2d491b4462ea6c4.tar.gz prebuilts_sdk-a56fdf543e7865d22d5613aea2d491b4462ea6c4.tar.bz2 | |
Import translations. DO NOT MERGE - Update prebuilt SDK to LMX71
Diffstat (limited to 'current/support')
68 files changed, 37 insertions, 14 deletions
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 77ad852..ce436f4 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.jar diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar Binary files differindex 3101eb0..a66fadd 100644 --- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar +++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar Binary files differindex 25f67cc..26efc38 100644 --- a/current/support/multidex/library/libs/android-support-multidex.jar +++ b/current/support/multidex/library/libs/android-support-multidex.jar diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar Binary files differindex ecad464..8ba2945 100644 --- a/current/support/v13/android-support-v13.jar +++ b/current/support/v13/android-support-v13.jar diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar Binary files differindex 9c7a42d..27579f7 100644 --- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar +++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar diff --git a/current/support/v17/leanback/res/layout/lb_details_description.xml b/current/support/v17/leanback/res/layout/lb_details_description.xml index 798504f..005cae4 100644 --- a/current/support/v17/leanback/res/layout/lb_details_description.xml +++ b/current/support/v17/leanback/res/layout/lb_details_description.xml @@ -23,7 +23,7 @@ > <!-- Top margins set programatically --> - <TextView + <android.support.v17.leanback.widget.ResizingTextView android:id="@+id/lb_details_description_title" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml index 1605112..3afae2f 100644 --- a/current/support/v17/leanback/res/values/attrs.xml +++ b/current/support/v17/leanback/res/values/attrs.xml @@ -169,6 +169,22 @@ <attr name="android:interpolator" /> </declare-styleable> + <declare-styleable name="lbResizingTextView"> + <!-- Conditions used to trigger text resizing --> + <attr name="resizeTrigger"> + <!-- Resize text whenever it lays out into the maximum number of lines --> + <flag name="maxLines" value="0x01" /> + </attr> + <!-- Text size for resized text --> + <attr name="resizedTextSize" format="dimension" /> + <!-- Whether to maintain the same line spacing when text is resized, default is true --> + <attr name="maintainLineSpacing" format="boolean" /> + <!-- Adjustment to top padding for resized text --> + <attr name="resizedPaddingAdjustmentTop" format="dimension" /> + <!-- Adjustment to bottom padding for resized text --> + <attr name="resizedPaddingAdjustmentBottom" format="dimension" /> + </declare-styleable> + <declare-styleable name="LeanbackTheme"> <!-- start padding of BrowseFragment, RowsFragment, DetailsFragment --> diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index e0be6eb..574fe32 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -83,6 +83,9 @@ <dimen name="lb_details_rows_align_top">167dp</dimen> <dimen name="lb_details_description_title_text_size">34sp</dimen> + <dimen name="lb_details_description_title_resized_text_size">28sp</dimen> + <dimen name="lb_details_description_title_padding_adjust_top">-1dp</dimen> + <dimen name="lb_details_description_title_padding_adjust_bottom">2dp</dimen> <dimen name="lb_details_description_subtitle_text_size">16sp</dimen> <dimen name="lb_details_description_body_text_size">14sp</dimen> <dimen name="lb_details_description_title_line_spacing">40dp</dimen> diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml index 64e216c..03be3ac 100644 --- a/current/support/v17/leanback/res/values/styles.xml +++ b/current/support/v17/leanback/res/values/styles.xml @@ -211,6 +211,10 @@ <item name="android:maxLines">@integer/lb_details_description_title_max_lines</item> <item name="android:includeFontPadding">false</item> <item name="android:ellipsize">end</item> + <item name="resizeTrigger">maxLines</item> + <item name="resizedTextSize">@dimen/lb_details_description_title_resized_text_size</item> + <item name="resizedPaddingAdjustmentTop">@dimen/lb_details_description_title_padding_adjust_top</item> + <item name="resizedPaddingAdjustmentBottom">@dimen/lb_details_description_title_padding_adjust_bottom</item> </style> <style name="Widget.Leanback.DetailsDescriptionSubtitleStyle"> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex c25f1f5..98d7a36 100644 --- a/current/support/v4/android-support-v4.jar +++ b/current/support/v4/android-support-v4.jar diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex 73b8df4..6e1a527 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/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar Binary files differindex 3e49ab5..aea22ec 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 Binary files differindex 458fc7d..f23ceee 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 Binary files differindex 2934932..db7f596 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/ic_cast_disabled_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_disabled_light.png Binary files differnew file mode 100644 index 0000000..440751e --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_disabled_light.png diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_off_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_off_light.png Binary files differnew file mode 100644 index 0000000..c6f9002 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_off_light.png diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png Binary files differnew file mode 100644 index 0000000..9d7a4e4 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_0_light.png diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png Binary files differnew file mode 100644 index 0000000..679bb98 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_1_light.png diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png Binary files differnew file mode 100644 index 0000000..2910903 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_2_light.png diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_light.png Binary files differnew file mode 100644 index 0000000..b7e6db8 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-hdpi/ic_cast_on_light.png diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_disabled_holo_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_disabled_holo_light.png Binary files differdeleted file mode 100644 index a014e91..0000000 --- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_disabled_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_off_holo_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_off_holo_light.png Binary files differdeleted file mode 100644 index aa1737e..0000000 --- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_off_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_0_holo_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_0_holo_light.png Binary files differdeleted file mode 100644 index dbdce3e..0000000 --- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_0_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_1_holo_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_1_holo_light.png Binary files differdeleted file mode 100644 index e8e9069..0000000 --- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_1_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_2_holo_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_2_holo_light.png Binary files differdeleted file mode 100644 index 14844d4..0000000 --- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_2_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_holo_light.png b/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_holo_light.png Binary files differdeleted file mode 100644 index 9b8fe87..0000000 --- a/current/support/v7/mediarouter/res/drawable-hdpi/mr_ic_media_route_on_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_disabled_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_disabled_light.png Binary files differnew file mode 100644 index 0000000..b60a666 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_disabled_light.png diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_off_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_off_light.png Binary files differnew file mode 100644 index 0000000..0de509a --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_off_light.png diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png Binary files differnew file mode 100644 index 0000000..6d94fee --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_0_light.png diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png Binary files differnew file mode 100644 index 0000000..af23356 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_1_light.png diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png Binary files differnew file mode 100644 index 0000000..8b238d4 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_2_light.png diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_light.png Binary files differnew file mode 100644 index 0000000..13c53e7 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-mdpi/ic_cast_on_light.png diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_disabled_holo_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_disabled_holo_light.png Binary files differdeleted file mode 100644 index 319c57e..0000000 --- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_disabled_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_off_holo_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_off_holo_light.png Binary files differdeleted file mode 100644 index b74cdb5..0000000 --- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_off_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_0_holo_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_0_holo_light.png Binary files differdeleted file mode 100644 index 106fd3a..0000000 --- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_0_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_1_holo_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_1_holo_light.png Binary files differdeleted file mode 100644 index 0b62d0b..0000000 --- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_1_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_2_holo_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_2_holo_light.png Binary files differdeleted file mode 100644 index 42b329f..0000000 --- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_2_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_holo_light.png b/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_holo_light.png Binary files differdeleted file mode 100644 index 25257f8..0000000 --- a/current/support/v7/mediarouter/res/drawable-mdpi/mr_ic_media_route_on_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_disabled_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_disabled_light.png Binary files differnew file mode 100644 index 0000000..fcb2139 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_disabled_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_off_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_off_light.png Binary files differnew file mode 100644 index 0000000..29f3779 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_off_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png Binary files differnew file mode 100644 index 0000000..e6c15a8 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_0_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png Binary files differnew file mode 100644 index 0000000..b46e60e --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_1_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png Binary files differnew file mode 100644 index 0000000..820f3a8 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_2_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_light.png Binary files differnew file mode 100644 index 0000000..aff2845 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xhdpi/ic_cast_on_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_disabled_holo_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_disabled_holo_light.png Binary files differdeleted file mode 100644 index b629a57..0000000 --- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_disabled_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_off_holo_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_off_holo_light.png Binary files differdeleted file mode 100644 index 9b59eaf..0000000 --- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_off_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_0_holo_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_0_holo_light.png Binary files differdeleted file mode 100644 index ff78803..0000000 --- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_0_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_1_holo_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_1_holo_light.png Binary files differdeleted file mode 100644 index 60f8c4d..0000000 --- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_1_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_2_holo_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_2_holo_light.png Binary files differdeleted file mode 100644 index 97a10a3..0000000 --- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_2_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_holo_light.png b/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_holo_light.png Binary files differdeleted file mode 100644 index db30613..0000000 --- a/current/support/v7/mediarouter/res/drawable-xhdpi/mr_ic_media_route_on_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_disabled_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_disabled_light.png Binary files differnew file mode 100644 index 0000000..6b74a0f --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_disabled_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_off_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_off_light.png Binary files differnew file mode 100644 index 0000000..e6099b5 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_off_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png Binary files differnew file mode 100644 index 0000000..bd7bf92 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_0_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png Binary files differnew file mode 100644 index 0000000..63e108f --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_1_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png Binary files differnew file mode 100644 index 0000000..f578d88 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_2_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_light.png Binary files differnew file mode 100644 index 0000000..904c2b6 --- /dev/null +++ b/current/support/v7/mediarouter/res/drawable-xxhdpi/ic_cast_on_light.png diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_disabled_holo_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_disabled_holo_light.png Binary files differdeleted file mode 100644 index 865617c..0000000 --- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_disabled_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_off_holo_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_off_holo_light.png Binary files differdeleted file mode 100644 index b5b29b0..0000000 --- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_off_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_0_holo_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_0_holo_light.png Binary files differdeleted file mode 100644 index 3fc7188..0000000 --- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_0_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_1_holo_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_1_holo_light.png Binary files differdeleted file mode 100644 index 092fe8c..0000000 --- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_1_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_2_holo_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_2_holo_light.png Binary files differdeleted file mode 100644 index 4fd5808..0000000 --- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_2_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_holo_light.png b/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_holo_light.png Binary files differdeleted file mode 100644 index d29e563..0000000 --- a/current/support/v7/mediarouter/res/drawable-xxhdpi/mr_ic_media_route_on_holo_light.png +++ /dev/null diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_holo_light.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_light.xml index aaa6473..d495d99 100644 --- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_holo_light.xml +++ b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_connecting_mono_light.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_light" android:duration="500" /> - <item android:drawable="@drawable/mr_ic_media_route_on_1_holo_light" android:duration="500" /> - <item android:drawable="@drawable/mr_ic_media_route_on_2_holo_light" android:duration="500" /> - <item android:drawable="@drawable/mr_ic_media_route_on_1_holo_light" android:duration="500" /> + <item android:drawable="@drawable/ic_cast_on_0_light" android:duration="500" /> + <item android:drawable="@drawable/ic_cast_on_1_light" android:duration="500" /> + <item android:drawable="@drawable/ic_cast_on_2_light" android:duration="500" /> + <item android:drawable="@drawable/ic_cast_on_1_light" android:duration="500" /> </animation-list> diff --git a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_light.xml b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.xml index 0e4a065..a8cf6c8 100644 --- a/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_holo_light.xml +++ b/current/support/v7/mediarouter/res/drawable/mr_ic_media_route_mono_light.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_light" /> + android:drawable="@drawable/ic_cast_on_light" /> <item android:state_checkable="true" android:state_enabled="true" - android:drawable="@drawable/mr_ic_media_route_connecting_holo_light" /> + android:drawable="@drawable/mr_ic_media_route_connecting_mono_light" /> <item android:state_enabled="true" - android:drawable="@drawable/mr_ic_media_route_off_holo_light" /> - <item android:drawable="@drawable/mr_ic_media_route_disabled_holo_light" /> + android:drawable="@drawable/ic_cast_off_light" /> + <item android:drawable="@drawable/ic_cast_disabled_light" /> </selector> diff --git a/current/support/v7/mediarouter/res/values/styles.xml b/current/support/v7/mediarouter/res/values/styles.xml index 500b0d9..9be8545 100644 --- a/current/support/v7/mediarouter/res/values/styles.xml +++ b/current/support/v7/mediarouter/res/values/styles.xml @@ -32,6 +32,6 @@ <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_light</item> + <item name="externalRouteEnabledDrawable">@drawable/mr_ic_media_route_mono_light</item> </style> </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 2eb4cc6..8350e04 100644 --- a/current/support/v7/mediarouter/res/values/themes.xml +++ b/current/support/v7/mediarouter/res/values/themes.xml @@ -21,7 +21,7 @@ <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="mediaRouteOnDrawable">@drawable/ic_media_route_on_mono_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> @@ -30,9 +30,9 @@ <style name="Theme.MediaRouter.Light" parent=""> <item name="mediaRouteButtonStyle">@style/Widget.MediaRouter.Light.MediaRouteButton</item> - <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/ic_cast_light</item> + <item name="mediaRouteOffDrawable">@drawable/ic_cast_off_light</item> + <item name="mediaRouteConnectingDrawable">@drawable/mr_ic_media_route_connecting_mono_light</item> + <item name="mediaRouteOnDrawable">@drawable/ic_cast_on_light</item> <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> diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar Binary files differindex f9a6de3..5c5a2af 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 Binary files differindex 999c6c6..f8fbdbf 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar |
