diff options
| author | Qiwen Zhao <zhao@google.com> | 2014-09-15 08:28:52 -0700 |
|---|---|---|
| committer | Qiwen Zhao <zhao@google.com> | 2014-09-15 08:28:52 -0700 |
| commit | 7bb1e6962661622cb6022a0a8f13e9696ab61c81 (patch) | |
| tree | 4a2c0c6da929146fe781f57464953debd2679d20 | |
| parent | e5ec8266d08fb5d2862c2d5a9a5c217e121f8bcf (diff) | |
| download | android-21-7bb1e6962661622cb6022a0a8f13e9696ab61c81.tar.gz | |
Import prebuilt android support libs build 1436544
http://android-build/builds/git_lmp-release-linux-sdk_x86-sdk/1436544/sdk-repo-linux-support-1436544.zip
54 files changed, 135 insertions, 42 deletions
diff --git a/support/appcompat/libs/android-support-v4.jar b/support/appcompat/libs/android-support-v4.jar Binary files differindex 50620b7c..186651b9 100644 --- a/support/appcompat/libs/android-support-v4.jar +++ b/support/appcompat/libs/android-support-v4.jar diff --git a/support/appcompat/libs/android-support-v7-appcompat.jar b/support/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex ba7b8c81..688f5d7c 100644 --- a/support/appcompat/libs/android-support-v7-appcompat.jar +++ b/support/appcompat/libs/android-support-v7-appcompat.jar diff --git a/support/appcompat/res/drawable-hdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-hdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..d6d1f2fc --- /dev/null +++ b/support/appcompat/res/drawable-hdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-hdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-hdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..ec8db6f6 --- /dev/null +++ b/support/appcompat/res/drawable-hdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-hdpi/abc_ic_menu_paste_mtrl_am_alpha.png b/support/appcompat/res/drawable-hdpi/abc_ic_menu_paste_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..bf447220 --- /dev/null +++ b/support/appcompat/res/drawable-hdpi/abc_ic_menu_paste_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-hdpi/abc_ic_menu_selectall_mtrl_alpha.png b/support/appcompat/res/drawable-hdpi/abc_ic_menu_selectall_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..85397418 --- /dev/null +++ b/support/appcompat/res/drawable-hdpi/abc_ic_menu_selectall_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png b/support/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png Binary files differindex 77845df9..2fa6d7e7 100644 --- a/support/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png +++ b/support/appcompat/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/support/appcompat/res/drawable-mdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-mdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..3fae32dc --- /dev/null +++ b/support/appcompat/res/drawable-mdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-mdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-mdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..61ff6316 --- /dev/null +++ b/support/appcompat/res/drawable-mdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-mdpi/abc_ic_menu_paste_mtrl_am_alpha.png b/support/appcompat/res/drawable-mdpi/abc_ic_menu_paste_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..112c2688 --- /dev/null +++ b/support/appcompat/res/drawable-mdpi/abc_ic_menu_paste_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-mdpi/abc_ic_menu_selectall_mtrl_alpha.png b/support/appcompat/res/drawable-mdpi/abc_ic_menu_selectall_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..64149563 --- /dev/null +++ b/support/appcompat/res/drawable-mdpi/abc_ic_menu_selectall_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png b/support/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png Binary files differindex 77845df9..070bdbfd 100644 --- a/support/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png +++ b/support/appcompat/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..b690d7c5 --- /dev/null +++ b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..10c20674 --- /dev/null +++ b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_ic_menu_paste_mtrl_am_alpha.png b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_paste_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..40246272 --- /dev/null +++ b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_paste_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_ic_menu_selectall_mtrl_alpha.png b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_selectall_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..f7c02618 --- /dev/null +++ b/support/appcompat/res/drawable-xhdpi/abc_ic_menu_selectall_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png b/support/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png Binary files differindex 77845df9..0d2836d8 100644 --- a/support/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png +++ b/support/appcompat/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/support/appcompat/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png b/support/appcompat/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png Binary files differindex 1ff7e096..5610d8c8 100644 --- a/support/appcompat/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png +++ b/support/appcompat/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png diff --git a/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..7c3a58b2 --- /dev/null +++ b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..2200642f --- /dev/null +++ b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_paste_mtrl_am_alpha.png b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_paste_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..28c0ae0e --- /dev/null +++ b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_paste_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_selectall_mtrl_alpha.png b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_selectall_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..6430d450 --- /dev/null +++ b/support/appcompat/res/drawable-xxhdpi/abc_ic_menu_selectall_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png b/support/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png Binary files differindex 0fafd1a0..b8ac46d1 100644 --- a/support/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png +++ b/support/appcompat/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png diff --git a/support/appcompat/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.png b/support/appcompat/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..70c20402 --- /dev/null +++ b/support/appcompat/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-xxxhdpi/abc_ic_search_api_mtrl_alpha.png b/support/appcompat/res/drawable-xxxhdpi/abc_ic_search_api_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..c873e9b0 --- /dev/null +++ b/support/appcompat/res/drawable-xxxhdpi/abc_ic_search_api_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png b/support/appcompat/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png Binary files differnew file mode 100644 index 00000000..1086e9d6 --- /dev/null +++ b/support/appcompat/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png diff --git a/support/appcompat/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png b/support/appcompat/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png Binary files differnew file mode 100644 index 00000000..5813179d --- /dev/null +++ b/support/appcompat/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png diff --git a/support/appcompat/res/values-sw600dp-land/dimens_material.xml b/support/appcompat/res/values-sw600dp-land/dimens_material.xml deleted file mode 100644 index 9e4d9bd0..00000000 --- a/support/appcompat/res/values-sw600dp-land/dimens_material.xml +++ /dev/null @@ -1,24 +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. ---> -<resources> - - <!-- Use the default title sizes on tablets. --> - <dimen name="abc_text_size_title_material_toolbar">@dimen/abc_text_size_title_material</dimen> - <!-- Use the default subtitle sizes on tablets. --> - <dimen name="abc_text_size_subtitle_material_toolbar">@dimen/abc_text_size_subhead_material</dimen> - -</resources> diff --git a/support/appcompat/res/values-sw600dp/dimens.xml b/support/appcompat/res/values-sw600dp/dimens.xml index 6f048fcd..38ecc36a 100644 --- a/support/appcompat/res/values-sw600dp/dimens.xml +++ b/support/appcompat/res/values-sw600dp/dimens.xml @@ -21,4 +21,13 @@ showAsAction="ifRoom" items can fit. "always" items can override this. --> <integer name="abc_max_action_buttons">5</integer> + <!-- Use the default title sizes on tablets. --> + <dimen name="abc_text_size_title_material_toolbar">@dimen/abc_text_size_title_material</dimen> + <!-- Use the default subtitle sizes on tablets. --> + <dimen name="abc_text_size_subtitle_material_toolbar">@dimen/abc_text_size_subhead_material</dimen> + <!-- Default height of an action bar. --> + <dimen name="abc_action_bar_default_height_material">64dp</dimen> + <!-- Default padding of an action bar. --> + <dimen name="abc_action_bar_default_padding_material">4dp</dimen> + </resources>
\ No newline at end of file diff --git a/support/appcompat/res/values-v11/themes_base.xml b/support/appcompat/res/values-v11/themes_base.xml index acbe04be..a8317e2d 100644 --- a/support/appcompat/res/values-v11/themes_base.xml +++ b/support/appcompat/res/values-v11/themes_base.xml @@ -200,7 +200,8 @@ <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> </style> - + <style name="Base.V11.Theme.AppCompat" parent="Base.V7.Theme.AppCompat" /> + <style name="Base.V11.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light" /> <style name="Base.V11.Theme.AppCompat.Dialog" parent="Base.V7.Theme.AppCompat.Dialog" /> <style name="Base.V11.Theme.AppCompat.Light.Dialog" parent="Platform.AppCompat.Light.Dialog"> @@ -238,6 +239,11 @@ <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_mtrl_am_alpha</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + + <item name="actionModeCutDrawable">@drawable/abc_ic_menu_cut_mtrl_alpha</item> + <item name="actionModeCopyDrawable">@drawable/abc_ic_menu_copy_mtrl_am_alpha</item> + <item name="actionModePasteDrawable">@drawable/abc_ic_menu_paste_mtrl_am_alpha</item> + <item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item> <!-- Dropdown Spinner Attributes --> @@ -298,8 +304,32 @@ <item name="colorControlHighlight">@color/ripple_material_light</item> </style> - <style name="Base.Theme.AppCompat.Dialog" parent="Base.V11.Theme.AppCompat.Dialog" /> + <style name="Base.Theme.AppCompat" parent="Base.V11.Theme.AppCompat"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> + + <style name="Base.Theme.AppCompat.Light" parent="Base.V11.Theme.AppCompat.Light"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> + + <style name="Base.Theme.AppCompat.Dialog" parent="Base.V11.Theme.AppCompat.Dialog"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> - <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog" /> + <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> </resources> diff --git a/support/appcompat/res/values-v14/themes_base.xml b/support/appcompat/res/values-v14/themes_base.xml new file mode 100644 index 00000000..3f26ca22 --- /dev/null +++ b/support/appcompat/res/values-v14/themes_base.xml @@ -0,0 +1,56 @@ +<?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. +--> + +<resources> + + <style name="Base.V14.Theme.AppCompat" parent="Base.V11.Theme.AppCompat" /> + <style name="Base.V14.Theme.AppCompat.Light" parent="Base.V11.Theme.AppCompat.Light" /> + <style name="Base.V14.Theme.AppCompat.Dialog" parent="Base.V11.Theme.AppCompat.Dialog" /> + <style name="Base.V14.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog" /> + + <style name="Base.Theme.AppCompat" parent="Base.V14.Theme.AppCompat"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeSelectAllDrawable">?actionModeSelectAllDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> + + <style name="Base.Theme.AppCompat.Light" parent="Base.V14.Theme.AppCompat.Light"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeSelectAllDrawable">?actionModeSelectAllDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> + + <style name="Base.Theme.AppCompat.Dialog" parent="Base.V14.Theme.AppCompat.Dialog"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeSelectAllDrawable">?actionModeSelectAllDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> + + <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V14.Theme.AppCompat.Light.Dialog"> + <item name="android:actionModeCutDrawable">?actionModeCutDrawable</item> + <item name="android:actionModeCopyDrawable">?actionModeCopyDrawable</item> + <item name="android:actionModePasteDrawable">?actionModePasteDrawable</item> + <item name="android:actionModeSelectAllDrawable">?actionModeSelectAllDrawable</item> + <item name="android:actionModeShareDrawable">?actionModeShareDrawable</item> + </style> + +</resources> diff --git a/support/appcompat/res/values-v17/styles_rtl.xml b/support/appcompat/res/values-v17/styles_rtl.xml index b4f78e52..0c7d8611 100644 --- a/support/appcompat/res/values-v17/styles_rtl.xml +++ b/support/appcompat/res/values-v17/styles_rtl.xml @@ -53,6 +53,7 @@ </style> <style name="RtlOverlay.Widget.AppCompat.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow"> + <item name="android:paddingStart">0dp</item> <item name="android:paddingEnd">12dp</item> </style> diff --git a/support/appcompat/res/values/dimens_material.xml b/support/appcompat/res/values/dimens_material.xml index 57b23237..d42e7b2c 100644 --- a/support/appcompat/res/values/dimens_material.xml +++ b/support/appcompat/res/values/dimens_material.xml @@ -27,6 +27,7 @@ <!-- Bottom margin for action bar subtitles --> <dimen name="abc_action_bar_subtitle_bottom_margin_material">5dp</dimen> + <dimen name="abc_action_button_min_width_overflow_material">36dp</dimen> <dimen name="abc_action_button_min_width_material">48dp</dimen> <dimen name="abc_action_button_min_height_material">48dp</dimen> diff --git a/support/appcompat/res/values/styles_base.xml b/support/appcompat/res/values/styles_base.xml index 8e528f73..2eda4c98 100644 --- a/support/appcompat/res/values/styles_base.xml +++ b/support/appcompat/res/values/styles_base.xml @@ -63,8 +63,8 @@ <style name="Base.Widget.AppCompat.ActionButton" parent=""> <item name="android:background">?attr/actionBarItemBackground</item> - <item name="android:paddingLeft">0dip</item> - <item name="android:paddingRight">0dip</item> + <item name="android:paddingLeft">12dip</item> + <item name="android:paddingRight">12dip</item> <item name="android:minWidth">@dimen/abc_action_button_min_width_material</item> <item name="android:minHeight">@dimen/abc_action_button_min_height_material</item> <item name="android:scaleType">center</item> @@ -81,6 +81,8 @@ <item name="android:src">@drawable/abc_ic_menu_moreoverflow_mtrl_alpha</item> <item name="android:background">?attr/actionBarItemBackground</item> <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item> + <item name="android:minWidth">@dimen/abc_action_button_min_width_overflow_material</item> + <item name="android:minHeight">@dimen/abc_action_button_min_height_material</item> </style> <style name="Base.Widget.AppCompat.ActionBar.TabBar" parent=""> diff --git a/support/appcompat/res/values/styles_rtl.xml b/support/appcompat/res/values/styles_rtl.xml index e4c7ee5f..fad12917 100644 --- a/support/appcompat/res/values/styles_rtl.xml +++ b/support/appcompat/res/values/styles_rtl.xml @@ -53,6 +53,7 @@ </style> <style name="RtlOverlay.Widget.AppCompat.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow"> + <item name="android:paddingLeft">0dp</item> <item name="android:paddingRight">12dp</item> </style> diff --git a/support/appcompat/res/values/themes_base.xml b/support/appcompat/res/values/themes_base.xml index eff056a6..7c14d0c3 100644 --- a/support/appcompat/res/values/themes_base.xml +++ b/support/appcompat/res/values/themes_base.xml @@ -191,6 +191,11 @@ <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_mtrl_am_alpha</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + + <item name="actionModeCutDrawable">@drawable/abc_ic_menu_cut_mtrl_alpha</item> + <item name="actionModeCopyDrawable">@drawable/abc_ic_menu_copy_mtrl_am_alpha</item> + <item name="actionModePasteDrawable">@drawable/abc_ic_menu_paste_mtrl_am_alpha</item> + <item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item> <!-- Panel attributes --> @@ -287,6 +292,11 @@ <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_mtrl_am_alpha</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + + <item name="actionModeCutDrawable">@drawable/abc_ic_menu_cut_mtrl_alpha</item> + <item name="actionModeCopyDrawable">@drawable/abc_ic_menu_copy_mtrl_am_alpha</item> + <item name="actionModePasteDrawable">@drawable/abc_ic_menu_paste_mtrl_am_alpha</item> + <item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item> <!-- Dropdown Spinner Attributes --> @@ -411,6 +421,11 @@ <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_mtrl_am_alpha</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> + + <item name="actionModeCutDrawable">@drawable/abc_ic_menu_cut_mtrl_alpha</item> + <item name="actionModeCopyDrawable">@drawable/abc_ic_menu_copy_mtrl_am_alpha</item> + <item name="actionModePasteDrawable">@drawable/abc_ic_menu_paste_mtrl_am_alpha</item> + <item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item> <!-- Panel attributes --> diff --git a/support/cardview/libs/android-support-v7-cardview.jar b/support/cardview/libs/android-support-v7-cardview.jar Binary files differindex cf373ec7..0a823f3f 100644 --- a/support/cardview/libs/android-support-v7-cardview.jar +++ b/support/cardview/libs/android-support-v7-cardview.jar diff --git a/support/gridlayout/libs/android-support-v7-gridlayout.jar b/support/gridlayout/libs/android-support-v7-gridlayout.jar Binary files differindex 4ac927ad..c8f48024 100644 --- a/support/gridlayout/libs/android-support-v7-gridlayout.jar +++ b/support/gridlayout/libs/android-support-v7-gridlayout.jar diff --git a/support/leanback/libs/android-support-v17-leanback.jar b/support/leanback/libs/android-support-v17-leanback.jar Binary files differindex 9c51f5e2..bb3a5a2e 100644 --- a/support/leanback/libs/android-support-v17-leanback.jar +++ b/support/leanback/libs/android-support-v17-leanback.jar diff --git a/support/leanback/res/drawable/lb_headers_right_fading.xml b/support/leanback/res/drawable/lb_headers_right_fading.xml index b20c4e84..96794db5 100644 --- a/support/leanback/res/drawable/lb_headers_right_fading.xml +++ b/support/leanback/res/drawable/lb_headers_right_fading.xml @@ -20,6 +20,6 @@ <gradient android:angle="0" android:startColor="#00000000" - android:endColor="?attr/defaultBrandColor" + android:endColor="@color/lb_default_brand_color" /> </shape> diff --git a/support/leanback/res/layout/lb_browse_fragment.xml b/support/leanback/res/layout/lb_browse_fragment.xml index 3009cf44..8ea9a533 100644 --- a/support/leanback/res/layout/lb_browse_fragment.xml +++ b/support/leanback/res/layout/lb_browse_fragment.xml @@ -32,7 +32,8 @@ <android.support.v17.leanback.app.BrowseRowsFrameLayout android:id="@+id/browse_container_dock" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:clipChildren="false" /> <!-- Padding needed for shadow --> <FrameLayout diff --git a/support/leanback/res/layout/lb_image_card_view.xml b/support/leanback/res/layout/lb_image_card_view.xml index 70cfff59..d5591d1c 100644 --- a/support/leanback/res/layout/lb_image_card_view.xml +++ b/support/leanback/res/layout/lb_image_card_view.xml @@ -27,7 +27,7 @@ android:scaleType="centerCrop" android:adjustViewBounds="true" android:contentDescription="@null" /> - <FrameLayout + <android.support.v17.leanback.widget.ImageCardViewInfo android:layout_width="match_parent" android:layout_height="wrap_content" lb:layout_viewType="info" > @@ -82,5 +82,5 @@ android:visibility="gone" android:contentDescription="@null" /> </RelativeLayout> - </FrameLayout> + </android.support.v17.leanback.widget.ImageCardViewInfo> </merge> diff --git a/support/leanback/res/layout/lb_row_container.xml b/support/leanback/res/layout/lb_row_container.xml index 0f5dd5f3..46eeef11 100644 --- a/support/leanback/res/layout/lb_row_container.xml +++ b/support/leanback/res/layout/lb_row_container.xml @@ -15,12 +15,12 @@ limitations under the License. --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> -<LinearLayout +<android.support.v17.leanback.widget.RowContainerViewHeaderDock android:id="@+id/lb_row_container_header_dock" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="?attr/browsePaddingLeft" android:clipToPadding="false"> -</LinearLayout> +</android.support.v17.leanback.widget.RowContainerViewHeaderDock> </merge>
\ No newline at end of file diff --git a/support/leanback/res/layout/lb_speech_orb.xml b/support/leanback/res/layout/lb_speech_orb.xml index ff6129b5..4806274b 100644 --- a/support/leanback/res/layout/lb_speech_orb.xml +++ b/support/leanback/res/layout/lb_speech_orb.xml @@ -18,13 +18,13 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" > <View - android:id="@+id/lb_speech_orb" + android:id="@+id/search_orb" android:layout_width="@dimen/lb_search_bar_speech_orb_size" android:layout_height="@dimen/lb_search_bar_speech_orb_size" android:background="@drawable/lb_speech_orb" /> <ImageView - android:id="@+id/lb_speech_icon" + android:id="@+id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/support/leanback/res/values-da/strings.xml b/support/leanback/res/values-da/strings.xml index 51a195a3..064be9ab 100644 --- a/support/leanback/res/values-da/strings.xml +++ b/support/leanback/res/values-da/strings.xml @@ -17,7 +17,7 @@ limitations under the License. <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="orb_search_action" msgid="5651268540267663887">"Søgehandling"</string> + <string name="orb_search_action" msgid="5651268540267663887">"Søg handling"</string> <string name="lb_search_bar_hint" msgid="8325490927970116252">"Søg"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Tal for at søge"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Søg efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> diff --git a/support/leanback/res/values-v19/themes.xml b/support/leanback/res/values-v19/themes.xml index 740a786c..a466ad73 100644 --- a/support/leanback/res/values-v19/themes.xml +++ b/support/leanback/res/values-v19/themes.xml @@ -19,5 +19,6 @@ <style name="Theme.LeanbackBase" parent="android:Theme.Holo.NoActionBar.TranslucentDecor"> <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item> <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item> + <item name="defaultBrandColor">@color/lb_default_brand_color</item> </style> </resources> diff --git a/support/leanback/res/values/colors.xml b/support/leanback/res/values/colors.xml index 9c4e5814..e49b2a52 100644 --- a/support/leanback/res/values/colors.xml +++ b/support/leanback/res/values/colors.xml @@ -42,7 +42,8 @@ <color name="lb_search_bar_hint">#FF888888</color> <color name="lb_search_bar_hint_speech_mode">#66222222</color> - <color name="lb_speech_orb_not_recording">#EEEEEE</color> + <color name="lb_speech_orb_not_recording">#CCCCCC</color> + <color name="lb_speech_orb_not_recording_pulsed">#EEEEEE</color> <color name="lb_speech_orb_recording">#ff4343</color> <color name="lb_speech_orb_not_recording_icon">#555555</color> diff --git a/support/leanback/res/values/dimens.xml b/support/leanback/res/values/dimens.xml index 83306ac4..5e0b4ee9 100644 --- a/support/leanback/res/values/dimens.xml +++ b/support/leanback/res/values/dimens.xml @@ -36,8 +36,8 @@ <dimen name="lb_browse_headers_width">270dp</dimen> <integer name="lb_browse_headers_transition_delay">150</integer> <integer name="lb_browse_headers_transition_duration">250</integer> - <integer name="lb_browse_rows_anim_duration">250</integer> + <item name="lb_browse_rows_scale" type="fraction">80%</item> <!-- Derived from the ux spec of 48dp baseline to baseline --> <dimen name="lb_browse_headers_vertical_margin">21dp</dimen> @@ -177,7 +177,6 @@ <dimen name="lb_search_orb_margin_right">4dp</dimen> <dimen name="lb_search_bar_speech_orb_size">52dp</dimen> - <item name="lb_search_bar_speech_orb_focused_zoom" type="fraction">120%</item> <item name="lb_search_bar_speech_orb_max_level_zoom" type="fraction">144%</item> <dimen name="lb_search_bar_speech_orb_margin_left">56dp</dimen> diff --git a/support/mediarouter/libs/android-support-v7-mediarouter.jar b/support/mediarouter/libs/android-support-v7-mediarouter.jar Binary files differindex fd829793..c0c3e8e2 100644 --- a/support/mediarouter/libs/android-support-v7-mediarouter.jar +++ b/support/mediarouter/libs/android-support-v7-mediarouter.jar diff --git a/support/mediarouter/res/values-hi/strings.xml b/support/mediarouter/res/values-hi/strings.xml index 9b1f77e9..6c9526c0 100644 --- a/support/mediarouter/res/values-hi/strings.xml +++ b/support/mediarouter/res/values-hi/strings.xml @@ -20,6 +20,6 @@ <string name="mr_user_route_category_name" msgid="7498112907524977311">"उपकरण"</string> <string name="mr_media_route_button_content_description" msgid="8327680881775995150">"कास्ट करें"</string> <string name="mr_media_route_chooser_title" msgid="7106830097177242655">"उपकरण से कनेक्ट करें"</string> - <string name="mr_media_route_chooser_searching" msgid="7553005460920830010">"उपकरणों की खोज हो रही है…"</string> + <string name="mr_media_route_chooser_searching" msgid="7553005460920830010">"डिवाइस की खोज हो रही है…"</string> <string name="mr_media_route_controller_disconnect" msgid="109793632378378069">"डिस्कनेक्ट करें"</string> </resources> diff --git a/support/multidex/libs/android-support-multidex.jar b/support/multidex/libs/android-support-multidex.jar Binary files differindex e633e374..8ca6bde8 100644 --- a/support/multidex/libs/android-support-multidex.jar +++ b/support/multidex/libs/android-support-multidex.jar diff --git a/support/recyclerview/libs/android-support-v7-recyclerview.jar b/support/recyclerview/libs/android-support-v7-recyclerview.jar Binary files differindex fc72e724..ada5ca53 100644 --- a/support/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/support/recyclerview/libs/android-support-v7-recyclerview.jar diff --git a/support/v13/android-support-v13.jar b/support/v13/android-support-v13.jar Binary files differindex d05005dc..18f5f792 100644 --- a/support/v13/android-support-v13.jar +++ b/support/v13/android-support-v13.jar diff --git a/support/v4/android-support-v4.jar b/support/v4/android-support-v4.jar Binary files differindex 50620b7c..186651b9 100644 --- a/support/v4/android-support-v4.jar +++ b/support/v4/android-support-v4.jar |
