diff options
author | Qiwen Zhao <zhao@google.com> | 2014-09-05 10:52:43 -0700 |
---|---|---|
committer | Qiwen Zhao <zhao@google.com> | 2014-09-05 10:52:43 -0700 |
commit | 2e532df7c8bd4b5970e9168880c245c15aa76afa (patch) | |
tree | 2a25ae7dee48baa9629eb5fdf055b3588e88b22c /current/support/v7/appcompat | |
parent | 0ccdf357092599296f792b253b2ff752a130c6d0 (diff) | |
download | prebuilts_sdk-2e532df7c8bd4b5970e9168880c245c15aa76afa.zip prebuilts_sdk-2e532df7c8bd4b5970e9168880c245c15aa76afa.tar.gz prebuilts_sdk-2e532df7c8bd4b5970e9168880c245c15aa76afa.tar.bz2 |
DO NOT MERGE - Update prebuilt SDK to 1411814
Diffstat (limited to 'current/support/v7/appcompat')
23 files changed, 63 insertions, 93 deletions
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 f343002..ede703e 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/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_dark.png Binary files differdeleted file mode 100644 index a587769..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_light.png Binary files differdeleted file mode 100644 index 7c1efe6..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_material_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differdeleted file mode 100644 index 5635459..0000000 --- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_cab_done_mtrl_alpha.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_dark.png Binary files differdeleted file mode 100644 index aa790ec..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_light.png Binary files differdeleted file mode 100644 index beb3194..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_material_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differdeleted file mode 100644 index 541184a..0000000 --- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_cab_done_mtrl_alpha.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_dark.png Binary files differdeleted file mode 100644 index 540786f..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_light.png Binary files differdeleted file mode 100644 index f9323f1..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_material_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differdeleted file mode 100644 index 3d6d734..0000000 --- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_cab_done_mtrl_alpha.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_dark.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_dark.png Binary files differdeleted file mode 100644 index 31317fd..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_dark.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_light.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_light.png Binary files differdeleted file mode 100644 index 5c409d9..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_material_light.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_mtrl_alpha.png Binary files differdeleted file mode 100644 index 1f9c734..0000000 --- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_cab_done_mtrl_alpha.png +++ /dev/null diff --git a/current/support/v7/appcompat/res/layout-large/abc_action_mode_close_item.xml b/current/support/v7/appcompat/res/layout-large/abc_action_mode_close_item.xml deleted file mode 100644 index 9778cf5..0000000 --- a/current/support/v7/appcompat/res/layout-large/abc_action_mode_close_item.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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" - xmlns:appcompat="http://schemas.android.com/apk/res-auto" - android:id="@+id/action_mode_close_button" - android:focusable="true" - android:clickable="true" - style="?attr/actionModeCloseButtonStyle" - android:layout_width="wrap_content" - android:layout_height="match_parent"> - <ImageView android:layout_width="48dip" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:scaleType="center" - android:src="?attr/actionModeCloseDrawable" /> - <android.support.v7.internal.widget.CompatTextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?attr/actionMenuTextColor" - android:textSize="12sp" - android:text="@string/abc_action_mode_done" - appcompat:textAllCaps="true" - style="@style/RtlOverlay.Widget.AppCompat.ActionButton.CloseMode.Text" /> -</LinearLayout> - diff --git a/current/support/v7/appcompat/res/layout/abc_action_mode_close_item.xml b/current/support/v7/appcompat/res/layout/abc_action_mode_close_item.xml deleted file mode 100644 index c36f93d..0000000 --- a/current/support/v7/appcompat/res/layout/abc_action_mode_close_item.xml +++ /dev/null @@ -1,30 +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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/action_mode_close_button" - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/abc_action_mode_done" - style="?attr/actionModeCloseButtonStyle" - android:layout_width="wrap_content" - android:layout_height="match_parent"> - <ImageView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:scaleType="fitCenter" - android:src="?attr/actionModeCloseDrawable"/> -</LinearLayout> diff --git a/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml b/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml new file mode 100644 index 0000000..4669453 --- /dev/null +++ b/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml @@ -0,0 +1,24 @@ +<?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. +--> + +<ImageButton xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/action_mode_close_button" + android:focusable="true" + android:clickable="true" + android:src="?attr/actionModeCloseDrawable" + style="?attr/actionModeCloseButtonStyle" + android:layout_width="wrap_content" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values-v11/themes_base.xml b/current/support/v7/appcompat/res/values-v11/themes_base.xml index 06c295f..5a7e603 100644 --- a/current/support/v7/appcompat/res/values-v11/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml @@ -237,7 +237,7 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">@drawable/abc_cab_background_top_material_light</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_light</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_material_light</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> diff --git a/current/support/v7/appcompat/res/values-v17/styles_rtl.xml b/current/support/v7/appcompat/res/values-v17/styles_rtl.xml index a85f54b..af9a123 100644 --- a/current/support/v7/appcompat/res/values-v17/styles_rtl.xml +++ b/current/support/v7/appcompat/res/values-v17/styles_rtl.xml @@ -57,9 +57,12 @@ <item name="android:layout_marginEnd">16dp</item> </style> - <style name="RtlOverlay.Widget.AppCompat.ActionButton.CloseMode.Text" parent="android:Widget"> - <item name="android:layout_marginStart">4dp</item> - <item name="android:layout_marginEnd">16dp</item> + <style name="RtlOverlay.Widget.AppCompat.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow"> + <item name="android:paddingEnd">12dp</item> + </style> + + <style name="RtlOverlay.Widget.AppCompat.Light.ActionButton.Overflow" parent="Base.Widget.AppCompat.Light.ActionButton.Overflow"> + <item name="android:paddingEnd">12dp</item> </style> <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem" parent="android:Widget"> diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml index 44a0d2d..8b0d824 100644 --- a/current/support/v7/appcompat/res/values/attrs.xml +++ b/current/support/v7/appcompat/res/values/attrs.xml @@ -408,6 +408,8 @@ <attr name="backgroundSplit"/> <!-- Specifies a fixed height for the action mode bar. --> <attr name="height"/> + <!-- Specifies a layout to use for the "close" item at the starting edge. --> + <attr name="closeItemLayout" format="reference" /> </declare-styleable> <declare-styleable name="View"> @@ -745,6 +747,11 @@ <attr name="android:dropDownHorizontalOffset" /> </declare-styleable> + <declare-styleable name="PopupWindow"> + <!-- Whether the popup window should overlap its anchor view. --> + <attr name="overlapAnchor" format="boolean" /> + </declare-styleable> + <declare-styleable name="DrawerArrowToggle"> <!-- The drawing color for the bars --> <attr name="color" format="color"/> diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml index c85439a..06b2b10 100644 --- a/current/support/v7/appcompat/res/values/styles.xml +++ b/current/support/v7/appcompat/res/values/styles.xml @@ -72,12 +72,10 @@ <style name="Widget.AppCompat.Light.ActionButton.CloseMode" parent="RtlOverlay.Widget.AppCompat.Light.ActionButton.CloseMode" /> <style name="Widget.AppCompat.ActionButton.Overflow" - parent="Base.Widget.AppCompat.ActionButton.Overflow"> - </style> + parent="RtlOverlay.Widget.AppCompat.ActionButton.Overflow" /> <style name="Widget.AppCompat.Light.ActionButton.Overflow" - parent="Base.Widget.AppCompat.Light.ActionButton.Overflow"> - </style> + parent="RtlOverlay.Widget.AppCompat.Light.ActionButton.Overflow" /> <style name="Widget.AppCompat.ActionBar.TabBar" parent="Base.Widget.AppCompat.ActionBar.TabBar"> diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml index d4d5247..26ed269 100644 --- a/current/support/v7/appcompat/res/values/styles_base.xml +++ b/current/support/v7/appcompat/res/values/styles_base.xml @@ -76,14 +76,17 @@ <style name="Base.Widget.AppCompat.Light.ActionButton" parent="Base.Widget.AppCompat.ActionButton"> </style> - <style name="Base.Widget.AppCompat.ActionButton.CloseMode" /> + <style name="Base.Widget.AppCompat.ActionButton.CloseMode"> + <item name="android:background">?attr/selectableItemBackgroundBorderless</item> + </style> - <style name="Base.Widget.AppCompat.Light.ActionButton.CloseMode" /> + <style name="Base.Widget.AppCompat.Light.ActionButton.CloseMode"> + <item name="android:background">?attr/selectableItemBackgroundBorderless</item> + </style> <style name="Base.Widget.AppCompat.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton"> <item name="android:src">@drawable/abc_ic_menu_moreoverflow_material_dark</item> <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item> - <item name="android:paddingRight">12dip</item> </style> <style name="Base.Widget.AppCompat.Light.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow"> @@ -139,8 +142,8 @@ <item name="backgroundSplit">?attr/actionModeSplitBackground</item> <item name="height">?attr/actionBarSize</item> <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title</item> - <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle - </item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle</item> + <item name="closeItemLayout">@layout/abc_action_mode_close_item_material</item> </style> <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title" parent="TextAppearance.AppCompat.Title"> @@ -194,6 +197,7 @@ <item name="android:popupBackground">@drawable/abc_popup_background_material_dark</item> <item name="android:dropDownVerticalOffset">0dip</item> <item name="android:dropDownHorizontalOffset">0dip</item> + <item name="overlapAnchor">true</item> <item name="android:dropDownWidth">wrap_content</item> <item name="popupPromptView">@layout/abc_simple_dropdown_hint</item> <item name="android:gravity">left|start|center_vertical</item> @@ -255,10 +259,12 @@ </style> <style name="Base.Widget.AppCompat.PopupMenu.Overflow"> + <item name="overlapAnchor">true</item> <item name="android:dropDownHorizontalOffset">-4dip</item> </style> <style name="Base.Widget.AppCompat.Light.PopupMenu.Overflow"> + <item name="overlapAnchor">true</item> <item name="android:dropDownHorizontalOffset">-4dip</item> </style> @@ -379,7 +385,7 @@ </style> <style name="Base.Widget.AppCompat.DrawerArrowToggle" parent=""> - <item name="color">?android:attr/textColorPrimary</item> + <item name="color">?android:attr/textColorSecondary</item> <item name="thickness">2dp</item> <item name="barSize">18dp</item> <item name="gapBetweenBars">3dp</item> diff --git a/current/support/v7/appcompat/res/values/styles_rtl.xml b/current/support/v7/appcompat/res/values/styles_rtl.xml index 6f5852e..ae19367 100644 --- a/current/support/v7/appcompat/res/values/styles_rtl.xml +++ b/current/support/v7/appcompat/res/values/styles_rtl.xml @@ -57,9 +57,12 @@ <item name="android:layout_marginRight">16dp</item> </style> - <style name="RtlOverlay.Widget.AppCompat.ActionButton.CloseMode.Text" parent="android:Widget"> - <item name="android:layout_marginLeft">4dp</item> - <item name="android:layout_marginRight">16dp</item> + <style name="RtlOverlay.Widget.AppCompat.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow"> + <item name="android:paddingRight">12dp</item> + </style> + + <style name="RtlOverlay.Widget.AppCompat.Light.ActionButton.Overflow" parent="Base.Widget.AppCompat.Light.ActionButton.Overflow"> + <item name="android:paddingRight">12dp</item> </style> <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem" parent="android:Widget"> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index 90e1842..2ee42b6 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -190,7 +190,7 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">@drawable/abc_cab_background_top_material_dark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_dark</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_material_dark</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> @@ -287,7 +287,7 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">@drawable/abc_cab_background_top_material_light</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_light</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_material_light</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> @@ -411,7 +411,7 @@ <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeBackground">@drawable/abc_cab_background_top_material_dark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_dark</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_material_dark</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> @@ -529,7 +529,7 @@ <!-- Action Mode styles --> <item name="actionModeBackground">@drawable/abc_cab_background_top_material_light</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_light</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_material_light</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_light</item> @@ -578,7 +578,7 @@ <!-- Action Mode styles --> <item name="actionModeBackground">@drawable/abc_cab_background_top_material_dark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_material_dark</item> + <item name="actionModeCloseDrawable">@drawable/abc_ic_ab_back_material_dark</item> <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_material_dark</item> |