diff options
author | Qiwen Zhao <zhao@google.com> | 2014-09-17 08:34:47 -0700 |
---|---|---|
committer | Qiwen Zhao <zhao@google.com> | 2014-09-17 08:34:47 -0700 |
commit | 30de467ac7a52292e2f069c43f9fe0502d40d338 (patch) | |
tree | 767821c67038097cf835e7ff633455509facffe2 | |
parent | 3f258e9795ec1d9ba4a23bfadb214a8e741ab9be (diff) | |
download | android-21-30de467ac7a52292e2f069c43f9fe0502d40d338.tar.gz |
Import prebuilt android support libs build 1442746
http://android-build/builds/git_lmp-release-linux-sdk_x86-sdk/1442746/sdk-repo-linux-support-1442746.zip
38 files changed, 23 insertions, 25 deletions
diff --git a/support/appcompat/libs/android-support-v4.jar b/support/appcompat/libs/android-support-v4.jar Binary files differindex 25de72a3..71ece583 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 b5ec0ffe..6a78c4ab 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-ldrtl-hdpi/abc_ic_ab_back_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_ab_back_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..dcdd03b7 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_ab_back_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..5338f02a --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..fd27a0f1 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-hdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png b/support/appcompat/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png Binary files differnew file mode 100644 index 00000000..d6e0b998 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png diff --git a/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_ab_back_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_ab_back_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..482e142d --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_ab_back_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..5aaad7eb --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..c0246b3c --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-mdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png b/support/appcompat/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png Binary files differnew file mode 100644 index 00000000..74160c38 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png diff --git a/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_ab_back_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_ab_back_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..753496a8 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_ab_back_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..8a4e22ef --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..69442677 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png Binary files differnew file mode 100644 index 00000000..2d633346 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png diff --git a/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..2b308bf9 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..9b5be204 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..07d0a5d3 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png Binary files differnew file mode 100644 index 00000000..bd1029d8 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png diff --git a/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..33f65879 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png Binary files differnew file mode 100644 index 00000000..a5015c68 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_menu_copy_mtrl_am_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_menu_cut_mtrl_alpha.png b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_menu_cut_mtrl_alpha.png Binary files differnew file mode 100644 index 00000000..2f12fc0d --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_ic_menu_cut_mtrl_alpha.png diff --git a/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png Binary files differnew file mode 100644 index 00000000..b1641732 --- /dev/null +++ b/support/appcompat/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png diff --git a/support/appcompat/res/layout/abc_screen_simple.xml b/support/appcompat/res/layout/abc_screen_simple.xml index 9d5c32d3..fa5b4c86 100644 --- a/support/appcompat/res/layout/abc_screen_simple.xml +++ b/support/appcompat/res/layout/abc_screen_simple.xml @@ -21,7 +21,7 @@ android:orientation="vertical" android:fitsSystemWindows="true"> - <ViewStub + <android.support.v7.internal.widget.ViewStubCompat android:id="@+id/action_mode_bar_stub" android:inflatedId="@+id/action_mode_bar" android:layout="@layout/abc_action_mode_bar" diff --git a/support/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml b/support/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml index fe4c533b..ada3d5b9 100644 --- a/support/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml +++ b/support/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml @@ -28,7 +28,7 @@ enabled. <include layout="@layout/abc_screen_content_include" /> - <ViewStub + <android.support.v7.internal.widget.ViewStubCompat android:id="@+id/action_mode_bar_stub" android:inflatedId="@+id/action_mode_bar" android:layout="@layout/abc_action_mode_bar" diff --git a/support/appcompat/res/values-v21/themes_base.xml b/support/appcompat/res/values-v21/themes_base.xml index f69aed7e..ab668ee6 100644 --- a/support/appcompat/res/values-v21/themes_base.xml +++ b/support/appcompat/res/values-v21/themes_base.xml @@ -199,39 +199,26 @@ </style> <style name="Base.ThemeOverlay.AppCompat.Dark" parent="android:ThemeOverlay.Material.Dark"> - <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> - - <item name="colorControlNormal">?android:attr/colorControlNormal</item> - <item name="colorControlActivated">?android:attr/colorControlActivated</item> - <item name="colorControlHighlight">?android:attr/colorControlHighlight</item> + <item name="colorControlHighlight">@color/ripple_material_dark</item> <!-- Used by MediaRouter --> <item name="isLightTheme">false</item> </style> <style name="Base.ThemeOverlay.AppCompat.Light" parent="android:ThemeOverlay.Material.Light"> - <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item> - - <item name="colorControlNormal">?android:attr/colorControlNormal</item> - <item name="colorControlActivated">?android:attr/colorControlActivated</item> - <item name="colorControlHighlight">?android:attr/colorControlHighlight</item> + <item name="colorControlHighlight">@color/ripple_material_light</item> <!-- Used by MediaRouter --> <item name="isLightTheme">true</item> </style> <style name="Base.ThemeOverlay.AppCompat.ActionBar" parent="android:ThemeOverlay.Material.ActionBar"> - <item name="colorControlNormal">?android:attr/colorControlNormal</item> - <item name="colorControlActivated">?android:attr/colorControlActivated</item> - <item name="colorControlHighlight">?android:attr/colorControlHighlight</item> + <item name="colorControlNormal">?android:attr/textColorPrimary</item> </style> <style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" parent="android:ThemeOverlay.Material.Dark.ActionBar"> - <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> - - <item name="colorControlNormal">?android:attr/colorControlNormal</item> - <item name="colorControlActivated">?android:attr/colorControlActivated</item> - <item name="colorControlHighlight">?android:attr/colorControlHighlight</item> + <item name="colorControlNormal">?android:attr/textColorPrimary</item> + <item name="colorControlHighlight">@color/ripple_material_dark</item> <!-- Used by MediaRouter --> <item name="isLightTheme">false</item> diff --git a/support/appcompat/res/values/attrs.xml b/support/appcompat/res/values/attrs.xml index 501bb695..9bf6e09f 100644 --- a/support/appcompat/res/values/attrs.xml +++ b/support/appcompat/res/values/attrs.xml @@ -775,4 +775,14 @@ <attr name="drawerArrowStyle" format="reference" /> + <declare-styleable name="ViewStubCompat"> + <!-- Supply an identifier for the layout resource to inflate when the ViewStub + becomes visible or when forced to do so. The layout resource must be a + valid reference to a layout. --> + <attr name="android:layout" /> + <!-- Overrides the id of the inflated View with this value. --> + <attr name="android:inflatedId" /> + <attr name="android:id" /> + </declare-styleable> + </resources> diff --git a/support/appcompat/res/values/styles_base.xml b/support/appcompat/res/values/styles_base.xml index 2eda4c98..632d7738 100644 --- a/support/appcompat/res/values/styles_base.xml +++ b/support/appcompat/res/values/styles_base.xml @@ -290,6 +290,7 @@ <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView"> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item> <item name="android:popupBackground">@drawable/abc_popup_background_mtrl_mult</item> + <item name="android:textColor">?attr/editTextColor</item> </style> <style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView"> diff --git a/support/cardview/libs/android-support-v7-cardview.jar b/support/cardview/libs/android-support-v7-cardview.jar Binary files differindex b39f7e29..2eb716e3 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 bd3180a4..303aea32 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 21f3230a..a3cc83ac 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/layout/lb_details_overview.xml b/support/leanback/res/layout/lb_details_overview.xml index ce337e8e..0eed2f38 100644 --- a/support/leanback/res/layout/lb_details_overview.xml +++ b/support/leanback/res/layout/lb_details_overview.xml @@ -49,7 +49,7 @@ android:paddingTop="@dimen/lb_details_overview_description_margin_top" android:orientation="vertical" > - <FrameLayout + <android.support.v17.leanback.widget.NonOverlappingFrameLayout android:id="@+id/details_overview_description" android:layout_width="wrap_content" android:layout_height="0dp" diff --git a/support/leanback/res/layout/lb_image_card_view.xml b/support/leanback/res/layout/lb_image_card_view.xml index d5591d1c..f74085c3 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" /> - <android.support.v17.leanback.widget.ImageCardViewInfo + <android.support.v17.leanback.widget.NonOverlappingFrameLayout 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> - </android.support.v17.leanback.widget.ImageCardViewInfo> + </android.support.v17.leanback.widget.NonOverlappingFrameLayout> </merge> diff --git a/support/leanback/res/layout/lb_row_container.xml b/support/leanback/res/layout/lb_row_container.xml index 46eeef11..1ed9f835 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"> -<android.support.v17.leanback.widget.RowContainerViewHeaderDock +<android.support.v17.leanback.widget.NonOverlappingLinearLayout 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"> -</android.support.v17.leanback.widget.RowContainerViewHeaderDock> +</android.support.v17.leanback.widget.NonOverlappingLinearLayout> </merge>
\ No newline at end of file diff --git a/support/mediarouter/libs/android-support-v7-mediarouter.jar b/support/mediarouter/libs/android-support-v7-mediarouter.jar Binary files differindex f923a78a..3cdff8b4 100644 --- a/support/mediarouter/libs/android-support-v7-mediarouter.jar +++ b/support/mediarouter/libs/android-support-v7-mediarouter.jar diff --git a/support/multidex/libs/android-support-multidex.jar b/support/multidex/libs/android-support-multidex.jar Binary files differindex eafbceab..80d6f02c 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 f9de0783..fd6007d8 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 60ed8bc0..a2935fa8 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 25de72a3..71ece583 100644 --- a/support/v4/android-support-v4.jar +++ b/support/v4/android-support-v4.jar |