diff options
48 files changed, 691 insertions, 227 deletions
diff --git a/current/android.jar b/current/android.jar Binary files differindex 7c03193..b0ee7fd 100644 --- a/current/android.jar +++ b/current/android.jar diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 556d148..bbab120 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.jar diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar Binary files differindex 1f4306d..21bdaa1 100644 --- a/current/support/design/libs/android-support-design.jar +++ b/current/support/design/libs/android-support-design.jar diff --git a/current/support/design/res/drawable/drawer_separator_background.xml b/current/support/design/res/drawable/drawer_separator_background.xml deleted file mode 100644 index 28df8f1..0000000 --- a/current/support/design/res/drawable/drawer_separator_background.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright (C) 2015 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. ---> -<inset xmlns:android="http://schemas.android.com/apk/res/android" - android:drawable="?android:attr/listDivider" - android:insetBottom="@dimen/drawer_separator_vertical_margin" - android:insetTop="@dimen/drawer_separator_vertical_margin" /> diff --git a/current/support/design/res/layout/design_drawer_item.xml b/current/support/design/res/layout/design_navigation_item.xml index e5ad38c..6f86719 100644 --- a/current/support/design/res/layout/design_drawer_item.xml +++ b/current/support/design/res/layout/design_navigation_item.xml @@ -20,8 +20,7 @@ android:layout_height="?attr/listPreferredItemHeightSmall" android:paddingLeft="?attr/listPreferredItemPaddingLeft" android:paddingRight="?attr/listPreferredItemPaddingRight" - android:drawablePadding="@dimen/drawer_icon_padding" + android:drawablePadding="@dimen/navigation_icon_padding" android:gravity="center_vertical|start" android:maxLines="1" - android:textAppearance="?attr/textAppearanceListItem" - android:textColor="?android:attr/textColorPrimary"/> + android:textAppearance="?attr/textAppearanceListItem"/> diff --git a/current/support/design/res/layout/design_drawer_item_separator.xml b/current/support/design/res/layout/design_navigation_item_separator.xml index 692f865..fb786aa 100644 --- a/current/support/design/res/layout/design_drawer_item_separator.xml +++ b/current/support/design/res/layout/design_navigation_item_separator.xml @@ -14,7 +14,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<View xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="@dimen/drawer_separator_overall_height" - android:background="@drawable/drawer_separator_background"/> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/navigation_separator_vertical_padding" + android:paddingBottom="@dimen/navigation_separator_vertical_padding"> + + <View android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider"/> + +</FrameLayout> diff --git a/current/support/design/res/layout/design_drawer_item_space.xml b/current/support/design/res/layout/design_navigation_item_space.xml index e8e7b2f..e8e7b2f 100644 --- a/current/support/design/res/layout/design_drawer_item_space.xml +++ b/current/support/design/res/layout/design_navigation_item_space.xml diff --git a/current/support/design/res/layout/design_drawer_item_subheader.xml b/current/support/design/res/layout/design_navigation_item_subheader.xml index 9a1a810..9a1a810 100644 --- a/current/support/design/res/layout/design_drawer_item_subheader.xml +++ b/current/support/design/res/layout/design_navigation_item_subheader.xml diff --git a/current/support/design/res/layout/design_drawer_menu.xml b/current/support/design/res/layout/design_navigation_menu.xml index 62d6fd5..6c75423 100644 --- a/current/support/design/res/layout/design_drawer_menu.xml +++ b/current/support/design/res/layout/design_navigation_menu.xml @@ -18,7 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="@dimen/drawer_padding_top_default" + android:paddingTop="@dimen/navigation_padding_top_default" android:clipToPadding="false" android:divider="@null" android:listSelector="?attr/selectableItemBackground"/> diff --git a/current/support/design/res/values-v21/dimens.xml b/current/support/design/res/values-v21/dimens.xml index b8a4d37..2a67937 100644 --- a/current/support/design/res/values-v21/dimens.xml +++ b/current/support/design/res/values-v21/dimens.xml @@ -15,5 +15,5 @@ ~ limitations under the License. --> <resources> - <dimen name="drawer_padding_top_default">24dp</dimen> + <dimen name="navigation_padding_top_default">24dp</dimen> </resources> diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml index 23f618c..7a5582e 100644 --- a/current/support/design/res/values/attrs.xml +++ b/current/support/design/res/values/attrs.xml @@ -39,11 +39,13 @@ <attr name="insetForeground" format="color|reference" /> </declare-styleable> - <declare-styleable name="NavigationDrawerView"> + <declare-styleable name="NavigationView"> <attr name="android:elevation" /> <attr name="android:background" /> <attr name="android:fitsSystemWindows" /> <attr name="android:maxWidth" /> + <attr name="itemTint" format="color|reference" /> + <attr name="itemBackground" format="reference" /> </declare-styleable> <declare-styleable name="TabLayout"> @@ -79,5 +81,65 @@ <attr name="tabPadding" format="dimension" /> </declare-styleable> + <declare-styleable name="CoordinatorLayout"> + <!-- A reference to an array of integers representing the + locations of horizontal keylines in dp from the starting edge. + Child views can refer to these keylines for alignment using + layout_keyline="index" where index is a 0-based index into + this array. --> + <attr name="keylines" format="reference" /> + </declare-styleable> + + <declare-styleable name="CoordinatorLayout_LayoutParams"> + <attr name="android:layout_gravity" /> + <!-- The class name of a Behavior class defining special runtime behavior + for this child view. --> + <attr name="layout_behavior" format="string" /> + <!-- The id of an anchor view that this view should position relative to. --> + <attr name="layout_anchor" format="reference" /> + <!-- The index of a keyline this view should position relative to. + android:layout_gravity will affect how the view aligns to the + specified keyline. --> + <attr name="layout_keyline" format="integer" /> + + <!-- Specifies how an object should position relative to an anchor, on both the X and Y axes, + within its parent's bounds. --> + <attr name="layout_anchorGravity"> + <!-- Push object to the top of its container, not changing its size. --> + <flag name="top" value="0x30" /> + <!-- Push object to the bottom of its container, not changing its size. --> + <flag name="bottom" value="0x50" /> + <!-- Push object to the left of its container, not changing its size. --> + <flag name="left" value="0x03" /> + <!-- Push object to the right of its container, not changing its size. --> + <flag name="right" value="0x05" /> + <!-- Place object in the vertical center of its container, not changing its size. --> + <flag name="center_vertical" value="0x10" /> + <!-- Grow the vertical size of the object if needed so it completely fills its container. --> + <flag name="fill_vertical" value="0x70" /> + <!-- Place object in the horizontal center of its container, not changing its size. --> + <flag name="center_horizontal" value="0x01" /> + <!-- Grow the horizontal size of the object if needed so it completely fills its container. --> + <flag name="fill_horizontal" value="0x07" /> + <!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. --> + <flag name="center" value="0x11" /> + <!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. --> + <flag name="fill" value="0x77" /> + <!-- Additional option that can be set to have the top and/or bottom edges of + the child clipped to its container's bounds. + The clip will be based on the vertical gravity: a top gravity will clip the bottom + edge, a bottom gravity will clip the top edge, and neither will clip both edges. --> + <flag name="clip_vertical" value="0x80" /> + <!-- Additional option that can be set to have the left and/or right edges of + the child clipped to its container's bounds. + The clip will be based on the horizontal gravity: a left gravity will clip the right + edge, a right gravity will clip the left edge, and neither will clip both edges. --> + <flag name="clip_horizontal" value="0x08" /> + <!-- Push object to the beginning of its container, not changing its size. --> + <flag name="start" value="0x00800003" /> + <!-- Push object to the end of its container, not changing its size. --> + <flag name="end" value="0x00800005" /> + </attr> + </declare-styleable> </resources> diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml index f7ef4a4..bb96119 100644 --- a/current/support/design/res/values/dimens.xml +++ b/current/support/design/res/values/dimens.xml @@ -22,17 +22,14 @@ <dimen name="fab_size_normal">56dp</dimen> <dimen name="fab_size_mini">40dp</dimen> - <dimen name="drawer_max_width">320dp</dimen> - <dimen name="drawer_elevation">12dp</dimen> - <dimen name="drawer_icon_padding">32dp</dimen> - <dimen name="drawer_icon_size">24dp</dimen> + <dimen name="navigation_max_width">320dp</dimen> + <dimen name="navigation_elevation">12dp</dimen> + <dimen name="navigation_icon_padding">32dp</dimen> + <dimen name="navigation_icon_size">24dp</dimen> + <dimen name="navigation_separator_vertical_padding">8dp</dimen> + <dimen name="navigation_padding_top_default">0dp</dimen> <dimen name="tab_min_width">72dp</dimen> <dimen name="tab_max_width">264dp</dimen> - <dimen name="drawer_separator_vertical_margin">8dp</dimen> - <!-- This needs to be drawer_separator_vertical_margin * 2 + 1 --> - <dimen name="drawer_separator_overall_height">17dp</dimen> - <dimen name="drawer_padding_top_default">0dp</dimen> - </resources> diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml index ecfaab4..f00293b 100644 --- a/current/support/design/res/values/styles.xml +++ b/current/support/design/res/values/styles.xml @@ -30,11 +30,11 @@ <item name="insetForeground">#4000</item> </style> - <style name="Widget.Design.NavigationDrawerView" parent=""> - <item name="android:elevation">@dimen/drawer_elevation</item> + <style name="Widget.Design.NavigationView" parent=""> + <item name="android:elevation">@dimen/navigation_elevation</item> <item name="android:background">?android:attr/windowBackground</item> <item name="android:fitsSystemWindows">true</item> - <item name="android:maxWidth">@dimen/drawer_max_width</item> + <item name="android:maxWidth">@dimen/navigation_max_width</item> </style> <style name="Widget.Design.TabLayout" parent="Base.Widget.Design.TabLayout"> 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 df9ef01..49b9b05 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 77f9805..ae1f975 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 c1e5959..9bd4baa 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 cade8ec..e17ac3c 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_browse_title.xml b/current/support/v17/leanback/res/layout/lb_browse_title.xml index e14350a..d3c944b 100644 --- a/current/support/v17/leanback/res/layout/lb_browse_title.xml +++ b/current/support/v17/leanback/res/layout/lb_browse_title.xml @@ -18,9 +18,5 @@ android:id="@+id/browse_title_group" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="?attr/browsePaddingTop" - android:paddingEnd="?attr/browsePaddingEnd" - android:paddingStart="?attr/browsePaddingStart" - android:paddingBottom="?attr/browsePaddingTop" style="?attr/browseTitleViewStyle" /> diff --git a/current/support/v17/leanback/res/layout/lb_list_row.xml b/current/support/v17/leanback/res/layout/lb_list_row.xml index 80d7bef..8d673f1 100644 --- a/current/support/v17/leanback/res/layout/lb_list_row.xml +++ b/current/support/v17/leanback/res/layout/lb_list_row.xml @@ -17,7 +17,10 @@ <android.support.v17.leanback.widget.HorizontalGridView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:lb="http://schemas.android.com/apk/res-auto" android:id="@+id/row_content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:clipToPadding="false" + lb:rowHeight="wrap_content" style="?attr/rowHorizontalGridStyle" /> diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml index 24b367e..a58840d 100644 --- a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml +++ b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml @@ -16,7 +16,7 @@ --> <!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child - views with no padding of their own. Also to allow for negative marge on description. --> + views with no padding of their own. Also to allow for negative margin on description. --> <android.support.v17.leanback.widget.PlaybackControlsRowView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" @@ -30,7 +30,7 @@ <LinearLayout android:id="@+id/controls_card" android:layout_width="match_parent" - android:layout_height="@dimen/lb_playback_controls_card_height" + android:layout_height="wrap_content" android:layout_marginBottom="@dimen/lb_playback_controls_margin_bottom" android:clipChildren="false" android:clipToPadding="false" @@ -39,13 +39,14 @@ <ImageView android:id="@+id/image" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="@dimen/lb_playback_controls_card_height" android:adjustViewBounds="true" android:scaleType="fitStart" /> <LinearLayout + android:id="@+id/controls_card_right_panel" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:clipChildren="false" android:clipToPadding="false" android:orientation="vertical" > @@ -53,21 +54,18 @@ <FrameLayout android:id="@+id/description_dock" android:layout_width="wrap_content" - android:layout_height="0dp" + android:layout_height="wrap_content" android:layout_marginEnd="@dimen/lb_playback_description_margin_end" android:layout_marginStart="@dimen/lb_playback_description_margin_start" android:paddingTop="@dimen/lb_playback_description_margin_top" android:clipToPadding="false" android:clipChildren="false" - android:layout_weight="1" android:gravity="top" /> - <!-- Space here prevents room only for title and subtitle above --> - <Space android:id="@+id/spacer" android:layout_width="match_parent" - android:layout_height="12dp" /> + android:layout_height="24dp" /> <FrameLayout android:id="@+id/controls_dock" diff --git a/current/support/v17/leanback/res/layout/lb_row_container.xml b/current/support/v17/leanback/res/layout/lb_row_container.xml index 69fb0e1..31b0f58 100644 --- a/current/support/v17/leanback/res/layout/lb_row_container.xml +++ b/current/support/v17/leanback/res/layout/lb_row_container.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingStart="?attr/browsePaddingStart" + style="?attr/rowHeaderDockStyle" android:clipToPadding="false"> </android.support.v17.leanback.widget.NonOverlappingLinearLayout> </merge>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml index c188b3c..0a5112d 100644 --- a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml +++ b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml @@ -24,6 +24,7 @@ android:id="@+id/container_list" android:layout_width="match_parent" android:layout_height="match_parent" + android:clipToPadding="false" style="?attr/rowsVerticalGridStyle" /> </android.support.v17.leanback.widget.ScaleFrameLayout>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/layout/lb_vertical_grid.xml b/current/support/v17/leanback/res/layout/lb_vertical_grid.xml index 7154e48..504c4c9 100644 --- a/current/support/v17/leanback/res/layout/lb_vertical_grid.xml +++ b/current/support/v17/leanback/res/layout/lb_vertical_grid.xml @@ -17,8 +17,11 @@ <android.support.v17.leanback.widget.VerticalGridView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:lb="http://schemas.android.com/apk/res-auto" android:id="@+id/browse_grid" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" + android:clipToPadding="false" + lb:columnWidth="wrap_content" style="?attr/itemsVerticalGridStyle" /> diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml index 7038fff..923ba3e 100644 --- a/current/support/v17/leanback/res/values/attrs.xml +++ b/current/support/v17/leanback/res/values/attrs.xml @@ -223,6 +223,8 @@ <attr name="rowHorizontalGridStyle" format="reference" /> <!-- header style inside a row --> <attr name="rowHeaderStyle" format="reference" /> + <!-- style for the layout that hosting Header inside a row --> + <attr name="rowHeaderDockStyle" format="reference" /> <!-- hover card title style --> <attr name="rowHoverCardTitleStyle" format="reference" /> diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml index 32f2f77..71c5122 100644 --- a/current/support/v17/leanback/res/values/styles.xml +++ b/current/support/v17/leanback/res/values/styles.xml @@ -98,6 +98,10 @@ </style> <style name="Widget.Leanback.TitleView" > + <item name="android:paddingTop">?attr/browsePaddingTop</item> + <item name="android:paddingBottom">?attr/browsePaddingTop</item> + <item name="android:paddingStart">?attr/browsePaddingStart</item> + <item name="android:paddingEnd">?attr/browsePaddingEnd</item> </style> <style name="Widget.Leanback.Title" /> @@ -127,7 +131,6 @@ <style name="Widget.Leanback.Headers.VerticalGridView" > <item name="android:paddingStart">?attr/browsePaddingStart</item> - <item name="android:clipToPadding">false</item> <item name="focusOutFront">true</item> <item name="focusOutEnd">true</item> <item name="verticalMargin">@dimen/lb_browse_headers_vertical_margin</item> @@ -145,7 +148,6 @@ <style name="Widget.Leanback.Rows.VerticalGridView" > <item name="android:paddingBottom">?attr/browsePaddingBottom</item> - <item name="android:clipToPadding">false</item> <item name="focusOutFront">true</item> <item name="focusOutEnd">true</item> <item name="android:focusable">true</item> @@ -153,7 +155,6 @@ </style> <style name="Widget.Leanback.Row.HorizontalGridView"> - <item name="android:clipToPadding">false</item> <item name="android:focusable">true</item> <item name="android:focusableInTouchMode">true</item> <item name="android:paddingStart">?attr/browsePaddingStart</item> @@ -163,11 +164,9 @@ <item name="horizontalMargin">@dimen/lb_browse_item_horizontal_margin</item> <item name="verticalMargin">@dimen/lb_browse_item_vertical_margin</item> <item name="focusOutFront">true</item> - <item name="rowHeight">wrap_content</item> </style> <style name="Widget.Leanback.GridItems.VerticalGridView"> - <item name="android:clipToPadding">false</item> <item name="android:focusable">true</item> <item name="android:focusableInTouchMode">true</item> <item name="android:paddingStart">?attr/browsePaddingStart</item> @@ -177,7 +176,6 @@ <item name="android:gravity">center_horizontal</item> <item name="horizontalMargin">@dimen/lb_browse_item_horizontal_margin</item> <item name="verticalMargin">@dimen/lb_browse_item_vertical_margin</item> - <item name="columnWidth">wrap_content</item> <item name="focusOutFront">true</item> </style> @@ -185,6 +183,10 @@ <item name="android:textAppearance">@style/TextAppearance.Leanback.Row.Header</item> </style> + <style name="Widget.Leanback.Row.HeaderDock"> + <item name="android:paddingStart">?attr/browsePaddingStart</item> + </style> + <style name="TextAppearance.Leanback.Row.HoverCardTitle" parent="TextAppearance.Leanback"> <item name="android:textSize">@dimen/lb_browse_row_hovercard_title_font_size</item> </style> diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml index 0503e17..457798b 100644 --- a/current/support/v17/leanback/res/values/themes.xml +++ b/current/support/v17/leanback/res/values/themes.xml @@ -53,6 +53,7 @@ <item name="rowHeaderStyle">@style/Widget.Leanback.Row.Header</item> <item name="rowHoverCardTitleStyle">@style/Widget.Leanback.Row.HoverCardTitle</item> <item name="rowHoverCardDescriptionStyle">@style/Widget.Leanback.Row.HoverCardDescription</item> + <item name="rowHeaderDockStyle">@style/Widget.Leanback.Row.HeaderDock</item> <item name="searchOrbViewStyle">@style/Widget.Leanback.SearchOrbViewStyle</item> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex eff4a74..43e5ea8 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 661a8da..04ddfee 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/abc_cab_background_top_material.xml b/current/support/v7/appcompat/res/drawable/abc_cab_background_top_material.xml index 68b7634..f20add7 100644 --- a/current/support/v7/appcompat/res/drawable/abc_cab_background_top_material.xml +++ b/current/support/v7/appcompat/res/drawable/abc_cab_background_top_material.xml @@ -14,8 +14,7 @@ limitations under the License. --> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android" - android:paddingMode="stack"> - <item android:drawable="@drawable/abc_cab_background_internal_bg" /> - <item android:drawable="@drawable/abc_cab_background_top_mtrl_alpha" /> -</layer-list>
\ No newline at end of file +<!-- This is a dummy drawable so that we can refer to the drawable ID --> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@android:color/white"/> +</shape> diff --git a/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml b/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml new file mode 100644 index 0000000..7335572 --- /dev/null +++ b/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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/parentPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/topPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/title_template" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical|start" + android:paddingLeft="?attr/dialogPreferredPadding" + android:paddingRight="?attr/dialogPreferredPadding" + android:paddingTop="@dimen/abc_dialog_padding_top_material"> + + <ImageView + android:id="@android:id/icon" + android:layout_width="32dip" + android:layout_height="32dip" + android:layout_marginEnd="8dip" + android:scaleType="fitCenter" + android:src="@null"/> + + <android.support.v7.internal.widget.DialogTitle + android:id="@+id/alertTitle" + style="?attr/android:windowTitleStyle" + android:singleLine="true" + android:ellipsize="end" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAlignment="viewStart"/> + + </LinearLayout> + <!-- If the client uses a customTitle, it will be added here. --> + </LinearLayout> + + <FrameLayout + android:id="@+id/contentPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="48dp"> + + <ScrollView + android:id="@+id/scrollView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipToPadding="false"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@android:id/message" + style="@style/TextAppearance.AppCompat.Subhead" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="?attr/dialogPreferredPadding" + android:paddingTop="@dimen/abc_dialog_padding_top_material" + android:paddingRight="?attr/dialogPreferredPadding"/> + + <View + android:id="@+id/textSpacerNoButtons" + android:visibility="gone" + android:layout_width="0dp" + android:layout_height="@dimen/abc_dialog_padding_top_material"/> + </LinearLayout> + </ScrollView> + + </FrameLayout> + + <FrameLayout + android:id="@+id/customPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="48dp"> + + <FrameLayout + android:id="@+id/custom" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + </FrameLayout> + + <LinearLayout + android:id="@+id/buttonPanel" + style="?attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layoutDirection="locale" + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:gravity="bottom"> + + <Button + android:id="@android:id/button3" + style="?attr/buttonBarNeutralButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible"/> + + <Button + android:id="@android:id/button2" + style="?attr/buttonBarNegativeButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + <Button + android:id="@android:id/button1" + style="?attr/buttonBarPositiveButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml b/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml new file mode 100644 index 0000000..d8f8135 --- /dev/null +++ b/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<!-- + This layout file is used by the AlertDialog when displaying a list of items. + This layout file is inflated and used as the ListView to display the items. + Assign an ID so its state will be saved/restored. +--> +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/select_dialog_listview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:cacheColorHint="@null" + android:listSelector="?attr/listDividerAlertDialog" + android:scrollbars="vertical" + android:overScrollMode="ifContentScrolls" + android:fadingEdge="none" + android:paddingTop="@dimen/abc_dialog_list_padding_vertical_material" + android:paddingBottom="@dimen/abc_dialog_list_padding_vertical_material" + android:clipToPadding="false" />
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/layout/select_dialog_item_material.xml b/current/support/v7/appcompat/res/layout/select_dialog_item_material.xml new file mode 100644 index 0000000..677b178 --- /dev/null +++ b/current/support/v7/appcompat/res/layout/select_dialog_item_material.xml @@ -0,0 +1,33 @@ +<?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. +--> + +<!-- + This layout file is used by the AlertDialog when displaying a list of items. + This layout file is inflated and used as the TextView to display individual + items. +--> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/listPreferredItemHeightSmall" + android:textAppearance="?attr/textAppearanceListItemSmall" + android:textColor="?attr/textColorAlertDialogListItem" + android:gravity="center_vertical" + android:paddingLeft="?attr/listPreferredItemPaddingLeft" + android:paddingRight="?attr/listPreferredItemPaddingRight" + android:ellipsize="marquee" /> diff --git a/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml b/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml new file mode 100644 index 0000000..d264210 --- /dev/null +++ b/current/support/v7/appcompat/res/layout/select_dialog_multichoice_material.xml @@ -0,0 +1,29 @@ +<?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. +--> + +<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/listPreferredItemHeightSmall" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?attr/textColorAlertDialogListItem" + android:gravity="center_vertical" + android:paddingStart="?attr/dialogPreferredPadding" + android:paddingEnd="?attr/dialogPreferredPadding" + android:checkMark="?android:attr/listChoiceIndicatorMultiple" + android:ellipsize="marquee" /> diff --git a/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml b/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml new file mode 100644 index 0000000..789c60b --- /dev/null +++ b/current/support/v7/appcompat/res/layout/select_dialog_singlechoice_material.xml @@ -0,0 +1,29 @@ +<?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. +--> + +<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/listPreferredItemHeightSmall" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?attr/textColorAlertDialogListItem" + android:gravity="center_vertical" + android:paddingStart="?attr/dialogPreferredPadding" + android:paddingEnd="?attr/dialogPreferredPadding" + android:checkMark="?android:attr/listChoiceIndicatorSingle" + android:ellipsize="marquee" /> 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 d344bf5..2ca5b6f 100644 --- a/current/support/v7/appcompat/res/values-v11/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml @@ -70,10 +70,6 @@ <item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item> <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> - <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item> - <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> - <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> - <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item> <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item> @@ -127,10 +123,6 @@ <item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item> <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> - <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item> - <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> - <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> - <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item> <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item> diff --git a/current/support/v7/appcompat/res/values-v21/themes_base.xml b/current/support/v7/appcompat/res/values-v21/themes_base.xml index b4ed97b..a8c3df4 100644 --- a/current/support/v7/appcompat/res/values-v21/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v21/themes_base.xml @@ -70,6 +70,17 @@ <item name="editTextColor">?android:attr/editTextColor</item> <item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item> + <!-- Copy the platform default styles for the AppCompat widgets --> + <item name="autoCompleteTextViewStyle">?android:attr/autoCompleteTextViewStyle</item> + <item name="buttonStyle">?android:attr/buttonStyle</item> + <item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item> + <item name="checkboxStyle">?android:attr/checkboxStyle</item> + <item name="checkedTextViewStyle">?android:attr/checkedTextViewStyle</item> + <item name="editTextStyle">?android:attr/editTextStyle</item> + <item name="radioButtonStyle">?android:attr/radioButtonStyle</item> + <item name="ratingBarStyle">?android:attr/ratingBarStyle</item> + <item name="spinnerStyle">?android:attr/spinnerStyle</item> + <!-- Copy our color theme attributes to the framework --> <item name="android:colorPrimary">?attr/colorPrimary</item> <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item> @@ -77,6 +88,7 @@ <item name="android:colorControlNormal">?attr/colorControlNormal</item> <item name="android:colorControlActivated">?attr/colorControlActivated</item> <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> + <item name="android:colorButtonNormal">?attr/colorButtonNormal</item> </style> <style name="Base.V21.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light"> @@ -107,6 +119,17 @@ <item name="editTextColor">?android:attr/editTextColor</item> <item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item> + <!-- Copy the platform default styles for the AppCompat widgets --> + <item name="autoCompleteTextViewStyle">?android:attr/autoCompleteTextViewStyle</item> + <item name="buttonStyle">?android:attr/buttonStyle</item> + <item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item> + <item name="checkboxStyle">?android:attr/checkboxStyle</item> + <item name="checkedTextViewStyle">?android:attr/checkedTextViewStyle</item> + <item name="editTextStyle">?android:attr/editTextStyle</item> + <item name="radioButtonStyle">?android:attr/radioButtonStyle</item> + <item name="ratingBarStyle">?android:attr/ratingBarStyle</item> + <item name="spinnerStyle">?android:attr/spinnerStyle</item> + <!-- Copy our color theme attributes to the framework --> <item name="android:colorPrimary">?attr/colorPrimary</item> <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item> @@ -114,38 +137,21 @@ <item name="android:colorControlNormal">?attr/colorControlNormal</item> <item name="android:colorControlActivated">?attr/colorControlActivated</item> <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> + <item name="android:colorButtonNormal">?attr/colorButtonNormal</item> </style> <style name="Base.V21.Theme.AppCompat.Dialog" parent="Base.V11.Theme.AppCompat.Dialog"> <item name="android:windowElevation">@dimen/abc_floating_window_z</item> + </style> - <!-- Action Bar styling attributes --> - <item name="actionBarSize">?android:attr/actionBarSize</item> - <item name="actionBarDivider">?android:attr/actionBarDivider</item> - <item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item> - <item name="actionButtonStyle">?android:attr/actionButtonStyle</item> - <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item> - <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item> - <item name="actionModeBackground">?android:attr/actionModeBackground</item> - <item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item> - <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> - <item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item> - <item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item> - - <!-- For PopupMenu --> - <item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item> - <item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item> - <item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item> + <style name="Base.V21.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog"> + <item name="android:windowElevation">@dimen/abc_floating_window_z</item> + </style> - <!-- General view attributes --> - <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> - <item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item> - <item name="dividerHorizontal">?android:attr/dividerHorizontal</item> - <item name="dividerVertical">?android:attr/dividerVertical</item> - <item name="editTextBackground">?android:attr/editTextBackground</item> - <item name="editTextColor">?android:attr/editTextColor</item> - <item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item> + <style name="Base.Theme.AppCompat.Dialog" parent="Base.V21.Theme.AppCompat.Dialog" /> + <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog" /> + <style name="Platform.ThemeOverlay.AppCompat.Dark" parent=""> <!-- Copy our color theme attributes to the framework --> <item name="android:colorPrimary">?attr/colorPrimary</item> <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item> @@ -153,38 +159,10 @@ <item name="android:colorControlNormal">?attr/colorControlNormal</item> <item name="android:colorControlActivated">?attr/colorControlActivated</item> <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> + <item name="android:colorButtonNormal">?attr/colorButtonNormal</item> </style> - <style name="Base.V21.Theme.AppCompat.Light.Dialog" parent="Base.V11.Theme.AppCompat.Light.Dialog"> - <item name="android:windowElevation">@dimen/abc_floating_window_z</item> - - <!-- Action Bar styling attributes --> - <item name="actionBarSize">?android:attr/actionBarSize</item> - <item name="actionBarDivider">?android:attr/actionBarDivider</item> - <item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item> - <item name="actionButtonStyle">?android:attr/actionButtonStyle</item> - <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item> - <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item> - <item name="actionModeBackground">?android:attr/actionModeBackground</item> - <item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item> - <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> - <item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item> - <item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item> - - <!-- For PopupMenu --> - <item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item> - <item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item> - <item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item> - - <!-- General view attributes --> - <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> - <item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item> - <item name="dividerHorizontal">?android:attr/dividerHorizontal</item> - <item name="dividerVertical">?android:attr/dividerVertical</item> - <item name="editTextBackground">?android:attr/editTextBackground</item> - <item name="editTextColor">?android:attr/editTextColor</item> - <item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item> - + <style name="Platform.ThemeOverlay.AppCompat.Light" parent=""> <!-- Copy our color theme attributes to the framework --> <item name="android:colorPrimary">?attr/colorPrimary</item> <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item> @@ -192,56 +170,7 @@ <item name="android:colorControlNormal">?attr/colorControlNormal</item> <item name="android:colorControlActivated">?attr/colorControlActivated</item> <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> - </style> - - <style name="Base.Theme.AppCompat.Dialog" parent="Base.V21.Theme.AppCompat.Dialog" /> - <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog" /> - - <style name="Base.ThemeOverlay.AppCompat" parent="android:ThemeOverlay.Material"> - <item name="android:colorControlNormal">?attr/colorControlNormal</item> - <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> - </style> - - <style name="Base.ThemeOverlay.AppCompat.Dark" parent="android:ThemeOverlay.Material.Dark"> - <item name="colorControlHighlight">@color/ripple_material_dark</item> - - <item name="android:colorControlNormal">?attr/colorControlNormal</item> - <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> - - <!-- Used by MediaRouter --> - <item name="isLightTheme">false</item> - </style> - - <style name="Base.ThemeOverlay.AppCompat.Light" parent="android:ThemeOverlay.Material.Light"> - <item name="colorControlHighlight">@color/ripple_material_light</item> - - <item name="android:colorControlNormal">?attr/colorControlNormal</item> - <item name="android:colorControlHighlight">?attr/colorControlHighlight</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/textColorPrimary</item> - - <item name="android:colorControlNormal">?attr/colorControlNormal</item> - <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> - - <item name="searchViewStyle">@style/Widget.AppCompat.SearchView.ActionBar</item> - </style> - - <style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" parent="android:ThemeOverlay.Material.Dark.ActionBar"> - <item name="colorControlNormal">?android:attr/textColorPrimary</item> - <item name="colorControlHighlight">@color/ripple_material_dark</item> - - <item name="android:colorControlNormal">?attr/colorControlNormal</item> - <item name="android:colorControlHighlight">?attr/colorControlHighlight</item> - - <item name="searchViewStyle">@style/Widget.AppCompat.SearchView.ActionBar</item> - - <!-- Used by MediaRouter --> - <item name="isLightTheme">false</item> + <item name="android:colorButtonNormal">?attr/colorButtonNormal</item> </style> </resources> diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml index 62c6085..5909e55 100644 --- a/current/support/v7/appcompat/res/values/attrs.xml +++ b/current/support/v7/appcompat/res/values/attrs.xml @@ -72,6 +72,17 @@ or a fraction of the screen size in that dimension. --> <attr name="windowFixedHeightMajor" format="dimension|fraction" /> + <!-- The minimum width the window is allowed to be, along the major + axis of the screen. That is, when in landscape. Can be either + an absolute dimension or a fraction of the screen size in that + dimension. --> + <attr name="windowMinWidthMajor" format="dimension|fraction" /> + <!-- The minimum width the window is allowed to be, along the minor + axis of the screen. That is, when in portrait. Can be either + an absolute dimension or a fraction of the screen size in that + dimension. --> + <attr name="windowMinWidthMinor" format="dimension|fraction" /> + <attr name="android:windowIsFloating" /> <attr name="android:windowAnimationStyle" /> @@ -174,7 +185,8 @@ <attr name="dialogTheme" format="reference" /> <!-- Preferred padding for dialog content. --> <attr name="dialogPreferredPadding" format="dimension" /> - + <!-- The list divider used in alert dialogs. --> + <attr name="listDividerAlertDialog" format="reference" /> <!-- =================== --> <!-- Other widget styles --> @@ -185,9 +197,6 @@ <attr name="actionDropDownStyle" format="reference"/> <!-- The preferred item height for dropdown lists. --> <attr name="dropdownListPreferredItemHeight" format="dimension"/> - - <!-- Default Spinner style. --> - <attr name="spinnerStyle" format="reference" /> <!-- Default Spinner style. --> <attr name="spinnerDropDownItemStyle" format="reference" /> <!-- Specifies a drawable to use for the 'home as up' indicator. --> @@ -228,9 +237,6 @@ <!-- EditText background drawable. --> <attr name="editTextBackground" format="reference" /> - <!-- Default style for the Switch widget. --> - <attr name="switchStyle" format="reference" /> - <!-- ============================ --> <!-- SearchView styles and assets --> <!-- ============================ --> @@ -317,6 +323,54 @@ <!-- The color applied to framework switch thumbs in their normal state. --> <attr name="colorSwitchThumbNormal" format="color" /> + <!-- ============ --> + <!-- Alert Dialog styles --> + <!-- ============ --> + <eat-comment /> + <attr name="alertDialogStyle" format="reference" /> + <attr name="alertDialogButtonGroupStyle" format="reference" /> + <attr name="alertDialogCenterButtons" format="boolean" /> + <!-- Theme to use for alert dialogs spawned from this theme. --> + <attr name="alertDialogTheme" format="reference" /> + + <!-- Color of list item text in alert dialogs. --> + <attr name="textColorAlertDialogListItem" format="reference|color" /> + + <!-- Style for the "positive" buttons within button bars --> + <attr name="buttonBarPositiveButtonStyle" format="reference" /> + + <!-- Style for the "negative" buttons within button bars --> + <attr name="buttonBarNegativeButtonStyle" format="reference" /> + + <!-- Style for the "neutral" buttons within button bars --> + <attr name="buttonBarNeutralButtonStyle" format="reference" /> + + <!-- ===================== --> + <!-- Default widget styles --> + <!-- ===================== --> + <eat-comment /> + + <!-- Default AutoCompleteTextView style. --> + <attr name="autoCompleteTextViewStyle" format="reference" /> + <!-- Normal Button style. --> + <attr name="buttonStyle" format="reference" /> + <!-- Small Button style. --> + <attr name="buttonStyleSmall" format="reference" /> + <!-- Default Checkbox style. --> + <attr name="checkboxStyle" format="reference" /> + <!-- Default CheckedTextView style. --> + <attr name="checkedTextViewStyle" format="reference" /> + <!-- Default EditText style. --> + <attr name="editTextStyle" format="reference" /> + <!-- Default RadioButton style. --> + <attr name="radioButtonStyle" format="reference" /> + <!-- Default RatingBar style. --> + <attr name="ratingBarStyle" format="reference" /> + <!-- Default Spinner style. --> + <attr name="spinnerStyle" format="reference" /> + <!-- Default style for the Switch widget. --> + <attr name="switchStyle" format="reference" /> + </declare-styleable> @@ -611,6 +665,29 @@ for more info. --> <attr name="actionProviderClass" format="string" /> + <!-- An optional tint for the item's icon --> + <attr name="iconTint" format="color" /> + + <!-- The blending mode used for tinting the item's icon --> + <attr name="iconTintMode"> + <!-- The tint is drawn on top of the drawable. + [Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] --> + <enum name="src_over" value="3" /> + <!-- The tint is masked by the alpha channel of the drawable. The drawable’s + color channels are thrown out. [Sa * Da, Sc * Da] --> + <enum name="src_in" value="5" /> + <!-- The tint is drawn above the drawable, but with the drawable’s alpha + channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] --> + <enum name="src_atop" value="9" /> + <!-- Multiplies the color and alpha channels of the drawable with those of + the tint. [Sa * Da, Sc * Dc] --> + <enum name="multiply" value="14" /> + <!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] --> + <enum name="screen" value="15" /> + <!-- Combines the tint and drawable color and alpha channels, clamping the + result to valid color values. Saturate(S + D). Only works on APIv 11+ --> + <enum name="add" value="16" /> + </attr> </declare-styleable> <declare-styleable name="Spinner"> @@ -696,7 +773,7 @@ <attr name="expandActivityOverflowButtonDrawable" format="reference" /> </declare-styleable> - <declare-styleable name="CompatTextView"> + <declare-styleable name="AppCompatTextView"> <!-- Present the text in ALL CAPS. This may use a small-caps form when available. --> <attr name="textAllCaps" format="reference|boolean" /> <attr name="android:textAppearance" /> @@ -778,6 +855,52 @@ <!-- Allows us to read in the minHeight attr pre-v16 --> <attr name="android:minHeight" /> + + <!-- Tint used for the overflow button --> + <attr name="overflowTint" format="color" /> + <!-- The blending mode used for tinting the overflow button --> + <attr name="overflowTintMode"> + <!-- The tint is drawn on top of the drawable. + [Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] --> + <enum name="src_over" value="3" /> + <!-- The tint is masked by the alpha channel of the drawable. The drawable’s + color channels are thrown out. [Sa * Da, Sc * Da] --> + <enum name="src_in" value="5" /> + <!-- The tint is drawn above the drawable, but with the drawable’s alpha + channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] --> + <enum name="src_atop" value="9" /> + <!-- Multiplies the color and alpha channels of the drawable with those of + the tint. [Sa * Da, Sc * Dc] --> + <enum name="multiply" value="14" /> + <!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] --> + <enum name="screen" value="15" /> + <!-- Combines the tint and drawable color and alpha channels, clamping the + result to valid color values. Saturate(S + D). Only works on APIv 11+ --> + <enum name="add" value="16" /> + </attr> + + <!-- Tint used for the navigation button --> + <attr name="navigationTint" format="color" /> + <!-- The blending mode used for tinting the navigation button --> + <attr name="navigationTintMode"> + <!-- The tint is drawn on top of the drawable. + [Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] --> + <enum name="src_over" value="3" /> + <!-- The tint is masked by the alpha channel of the drawable. The drawable’s + color channels are thrown out. [Sa * Da, Sc * Da] --> + <enum name="src_in" value="5" /> + <!-- The tint is drawn above the drawable, but with the drawable’s alpha + channel masking the result. [Da, Sc * Da + (1 - Sa) * Dc] --> + <enum name="src_atop" value="9" /> + <!-- Multiplies the color and alpha channels of the drawable with those of + the tint. [Sa * Da, Sc * Dc] --> + <enum name="multiply" value="14" /> + <!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] --> + <enum name="screen" value="15" /> + <!-- Combines the tint and drawable color and alpha channels, clamping the + result to valid color values. Saturate(S + D). Only works on APIv 11+ --> + <enum name="add" value="16" /> + </attr> </declare-styleable> <declare-styleable name="PopupWindowBackgroundState"> @@ -860,4 +983,14 @@ <attr name="textAllCaps" /> </declare-styleable> + <!-- The set of attributes that describe a AlertDialog's theme. --> + <declare-styleable name="AlertDialog"> + <attr name="android:layout" /> + <attr name="buttonPanelSideLayout" format="reference" /> + <attr name="listLayout" format="reference" /> + <attr name="multiChoiceItemLayout" format="reference" /> + <attr name="singleChoiceItemLayout" format="reference" /> + <attr name="listItemLayout" format="reference" /> + </declare-styleable> + </resources> diff --git a/current/support/v7/appcompat/res/values/dimens.xml b/current/support/v7/appcompat/res/values/dimens.xml index fb0d94c..b8fa76c 100644 --- a/current/support/v7/appcompat/res/values/dimens.xml +++ b/current/support/v7/appcompat/res/values/dimens.xml @@ -84,4 +84,17 @@ <!-- Dialog button bar height --> <dimen name="abc_alert_dialog_button_bar_height">48dp</dimen> + <!-- Padding above and below selection dialog lists. --> + <dimen name="abc_dialog_list_padding_vertical_material">8dp</dimen> + + <!-- The platform's desired minimum size for a dialog's width when it + is along the major axis (that is the screen is landscape). This may + be either a fraction or a dimension. --> + <item type="dimen" name="abc_dialog_min_width_major">65%</item> + + <!-- The platform's desired minimum size for a dialog's width when it + is along the minor axis (that is the screen is portrait). This may + be either a fraction or a dimension. --> + <item type="dimen" name="abc_dialog_min_width_minor">95%</item> + </resources> diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml index 13d910e..6215eb1 100644 --- a/current/support/v7/appcompat/res/values/styles.xml +++ b/current/support/v7/appcompat/res/values/styles.xml @@ -223,6 +223,10 @@ <style name="Widget.AppCompat.TextView.SpinnerItem" parent="Base.Widget.AppCompat.TextView.SpinnerItem" /> + <style name="AlertDialog.AppCompat" parent="Base.AlertDialog.AppCompat" /> + + <style name="AlertDialog.AppCompat.Light" parent="Base.AlertDialog.AppCompat.Light" /> + <!-- Toolbar --> <style name="Widget.AppCompat.Toolbar" parent="Base.Widget.AppCompat.Toolbar" /> diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml index 73f81c9..aab89b6 100644 --- a/current/support/v7/appcompat/res/values/styles_base.xml +++ b/current/support/v7/appcompat/res/values/styles_base.xml @@ -467,4 +467,14 @@ <item name="android:windowExitAnimation">@anim/abc_shrink_fade_out_from_bottom</item> </style> + <style name="Base.AlertDialog.AppCompat" parent="android:Widget"> + <item name="android:layout">@layout/abc_alert_dialog_material</item> + <item name="listLayout">@layout/abc_select_dialog_material</item> + <item name="listItemLayout">@layout/select_dialog_item_material</item> + <item name="multiChoiceItemLayout">@layout/select_dialog_multichoice_material</item> + <item name="singleChoiceItemLayout">@layout/select_dialog_singlechoice_material</item> + </style> + + <style name="Base.AlertDialog.AppCompat.Light" parent="Base.AlertDialog.AppCompat" /> + </resources> diff --git a/current/support/v7/appcompat/res/values/themes.xml b/current/support/v7/appcompat/res/values/themes.xml index 5742251..f8962df 100644 --- a/current/support/v7/appcompat/res/values/themes.xml +++ b/current/support/v7/appcompat/res/values/themes.xml @@ -56,6 +56,19 @@ <style name="Theme.AppCompat.Light.Dialog" parent="Base.Theme.AppCompat.Light.Dialog" /> + + <!-- Material theme for alert dialog windows, which is used by the AlertDialog class. + This is basically a dialog but sets the background to empty so it can do + two-tone backgrounds. For applications targeting Honeycomb or newer, this is the default + AlertDialog theme. --> + <style name="Theme.AppCompat.Dialog.Alert" parent="Base.Theme.AppCompat.Dialog.Alert" /> + <style name="Theme.AppCompat.Light.Dialog.Alert" parent="Base.Theme.AppCompat.Light.Dialog.Alert" /> + + <!-- Variant of Theme.AppCompat.Dialog that has a nice minimum width for + a regular dialog. --> + <style name="Theme.AppCompat.Dialog.MinWidth" parent="Base.Theme.AppCompat.Dialog.MinWidth" /> + <style name="Theme.AppCompat.Light.Dialog.MinWidth" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth" /> + <!-- Menu/item attributes --> <style name="Theme.AppCompat.CompactMenu" parent="Base.Theme.AppCompat.CompactMenu" /> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index 025352d..5b45584 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -57,10 +57,6 @@ <item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item> <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> - <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item> - <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> - <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> - <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item> <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item> </style> @@ -101,10 +97,6 @@ <item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item> <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> - <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item> - <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> - <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> - <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item> <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item> </style> @@ -181,6 +173,11 @@ <item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item> + <!-- Spinner styles --> + <item name="spinnerStyle">@style/Widget.AppCompat.Spinner</item> + <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> + <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> + <!-- Required for use of support_simple_spinner_dropdown_item.xml --> <item name="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> <item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item> @@ -206,10 +203,10 @@ <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item> <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> - <item name="android:editTextStyle">@style/Widget.AppCompat.EditText</item> + <item name="editTextStyle">@style/Widget.AppCompat.EditText</item> <item name="editTextBackground">@drawable/abc_edit_text_material</item> <item name="editTextColor">?android:attr/textColorPrimary</item> - <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> + <item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> <!-- Color palette --> <item name="colorPrimaryDark">@color/primary_dark_material_dark</item> @@ -224,23 +221,32 @@ <item name="drawerArrowStyle">@style/Widget.AppCompat.DrawerArrowToggle</item> - <item name="android:checkboxStyle">@style/Widget.AppCompat.CompoundButton.CheckBox</item> - <item name="android:radioButtonStyle">@style/Widget.AppCompat.CompoundButton.RadioButton</item> + <item name="checkboxStyle">@style/Widget.AppCompat.CompoundButton.CheckBox</item> + <item name="radioButtonStyle">@style/Widget.AppCompat.CompoundButton.RadioButton</item> <item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch</item> - <item name="android:ratingBarStyle">@style/Widget.AppCompat.RatingBar</item> + <item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item> <!-- Button styles --> - <item name="android:buttonStyle">@style/Widget.AppCompat.Button</item> - <item name="android:buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item> + <item name="buttonStyle">@style/Widget.AppCompat.Button</item> + <item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item> <item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Button</item> <item name="buttonBarStyle">@style/Widget.AppCompat.ButtonBar</item> <item name="buttonBarButtonStyle">@style/Widget.AppCompat.Button.ButtonBar.AlertDialog</item> + <item name="buttonBarPositiveButtonStyle">?attr/buttonBarButtonStyle</item> + <item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item> + <item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item> <!-- Dialog attributes --> <item name="dialogTheme">@style/Theme.AppCompat.Dialog</item> <item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item> + + <item name="alertDialogTheme">@style/Theme.AppCompat.Dialog.Alert</item> + <item name="alertDialogStyle">@style/AlertDialog.AppCompat</item> + <item name="alertDialogCenterButtons">false</item> + <item name="textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item> + <item name="listDividerAlertDialog">@null</item> </style> <!-- Base platform-dependent theme providing an action bar in a light-themed activity. --> @@ -307,6 +313,11 @@ <item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item> + <!-- Spinner styles --> + <item name="spinnerStyle">@style/Widget.AppCompat.Spinner</item> + <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> + <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> + <!-- Required for use of support_simple_spinner_dropdown_item.xml --> <item name="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> <item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item> @@ -332,10 +343,10 @@ <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item> <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> - <item name="android:editTextStyle">@style/Widget.AppCompat.EditText</item> + <item name="editTextStyle">@style/Widget.AppCompat.EditText</item> <item name="editTextBackground">@drawable/abc_edit_text_material</item> <item name="editTextColor">?android:attr/textColorPrimary</item> - <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> + <item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> <!-- Color palette --> <item name="colorPrimaryDark">@color/primary_dark_material_light</item> @@ -350,23 +361,32 @@ <item name="drawerArrowStyle">@style/Widget.AppCompat.DrawerArrowToggle</item> - <item name="android:checkboxStyle">@style/Widget.AppCompat.CompoundButton.CheckBox</item> - <item name="android:radioButtonStyle">@style/Widget.AppCompat.CompoundButton.RadioButton</item> + <item name="checkboxStyle">@style/Widget.AppCompat.CompoundButton.CheckBox</item> + <item name="radioButtonStyle">@style/Widget.AppCompat.CompoundButton.RadioButton</item> <item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch</item> - <item name="android:ratingBarStyle">@style/Widget.AppCompat.RatingBar</item> + <item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item> <!-- Button styles --> - <item name="android:buttonStyle">@style/Widget.AppCompat.Button</item> - <item name="android:buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item> + <item name="buttonStyle">@style/Widget.AppCompat.Button</item> + <item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item> <item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Button</item> <item name="buttonBarStyle">@style/Widget.AppCompat.ButtonBar</item> <item name="buttonBarButtonStyle">@style/Widget.AppCompat.Button.ButtonBar.AlertDialog</item> + <item name="buttonBarPositiveButtonStyle">?attr/buttonBarButtonStyle</item> + <item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item> + <item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item> <!-- Dialog attributes --> <item name="dialogTheme">@style/Theme.AppCompat.Light.Dialog</item> <item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item> + + <item name="alertDialogTheme">@style/Theme.AppCompat.Light.Dialog.Alert</item> + <item name="alertDialogStyle">@style/AlertDialog.AppCompat.Light</item> + <item name="alertDialogCenterButtons">false</item> + <item name="textColorAlertDialogListItem">@color/abc_primary_text_material_light</item> + <item name="listDividerAlertDialog">@null</item> </style> <style name="Base.Theme.AppCompat" parent="Base.V7.Theme.AppCompat"> @@ -441,6 +461,26 @@ <style name="Base.Theme.AppCompat.Dialog" parent="Base.V7.Theme.AppCompat.Dialog" /> <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V7.Theme.AppCompat.Light.Dialog" /> + <style name="Base.Theme.AppCompat.Dialog.Alert"> + <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item> + <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item> + </style> + + <style name="Base.Theme.AppCompat.Light.Dialog.Alert"> + <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item> + <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item> + </style> + + <style name="Base.Theme.AppCompat.Dialog.MinWidth"> + <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item> + <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item> + </style> + + <style name="Base.Theme.AppCompat.Light.Dialog.MinWidth"> + <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item> + <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item> + </style> + <style name="Base.Theme.AppCompat.Dialog.FixedSize"> <item name="windowFixedWidthMajor">@dimen/dialog_fixed_width_major</item> <item name="windowFixedWidthMinor">@dimen/dialog_fixed_width_minor</item> @@ -463,7 +503,28 @@ <!-- Overlay themes --> <style name="Base.ThemeOverlay.AppCompat" parent="" /> - <style name="Base.ThemeOverlay.AppCompat.Light"> + <style name="Platform.ThemeOverlay.AppCompat.Dark" parent=""> + <!-- Action Bar styles --> + <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> + <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> + <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> + + <!-- SearchView styles --> + <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> + <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> + </style> + + <style name="Platform.ThemeOverlay.AppCompat.Light" parent=""> + <item name="actionBarItemBackground">@drawable/abc_item_background_holo_light</item> + <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> + <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> + + <!-- SearchView attributes --> + <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.Light.AutoCompleteTextView</item> + <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> + </style> + + <style name="Base.ThemeOverlay.AppCompat.Light" parent="Platform.ThemeOverlay.AppCompat.Light"> <item name="android:windowBackground">@color/background_material_light</item> <item name="android:colorForeground">@color/bright_foreground_material_light</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item> @@ -483,16 +544,9 @@ <item name="android:textColorHighlight">@color/highlighted_text_material_light</item> <item name="android:textColorLink">@color/link_text_material_light</item> - <item name="actionBarItemBackground">@drawable/abc_item_background_holo_light</item> - <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> - <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> - - <!-- SearchView attributes --> - <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.Light.AutoCompleteTextView</item> - <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> - <item name="colorControlNormal">?android:attr/textColorSecondary</item> <item name="colorControlHighlight">@color/ripple_material_light</item> + <item name="colorButtonNormal">@color/button_material_light</item> <item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item> <!-- Used by MediaRouter --> @@ -518,17 +572,9 @@ <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> <item name="android:textColorLink">@color/link_text_material_dark</item> - <!-- Action Bar styles --> - <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> - <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> - <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> - - <!-- SearchView styles --> - <item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> - <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> - <item name="colorControlNormal">?android:attr/textColorSecondary</item> <item name="colorControlHighlight">@color/ripple_material_dark</item> + <item name="colorButtonNormal">@color/button_material_dark</item> <item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item> <!-- Used by MediaRouter --> 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 c5b26d0..7af8850 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 bca7577..43147f8 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 ca6e2b4..a981b31 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/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar Binary files differindex 24fb53d..d4d263f 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 2291e41..1b111d9 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar diff --git a/current/uiautomator.jar b/current/uiautomator.jar Binary files differindex 9ec7a01..5173917 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar |