diff options
Diffstat (limited to 'current/support/v7/appcompat/res/values')
12 files changed, 756 insertions, 361 deletions
diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml index e0c8465..59d0e61 100644 --- a/current/support/v7/appcompat/res/values/attrs.xml +++ b/current/support/v7/appcompat/res/values/attrs.xml @@ -307,6 +307,35 @@ <!-- Drawable used as a background for selected list items. --> <attr name="listChoiceBackgroundIndicator" format="reference" /> + <!-- ============= --> + <!-- Color palette --> + <!-- ============= --> + <eat-comment /> + + <!-- The primary branding color for the app. By default, this is the color applied to the + action bar background. --> + <attr name="colorPrimary" format="color" /> + + <!-- Dark variant of the primary branding color. By default, this is the color applied to + the status bar (via statusBarColor) and navigation bar (via navigationBarColor). --> + <attr name="colorPrimaryDark" format="color" /> + + <!-- Bright complement to the primary branding color. By default, this is the color applied + to framework controls (via colorControlActivated). --> + <attr name="colorAccent" format="color" /> + + <!-- The color applied to framework controls in their normal state. --> + <attr name="colorControlNormal" format="color" /> + + <!-- The color applied to framework controls in their activated (ex. checked) state. --> + <attr name="colorControlActivated" format="color" /> + + <!-- The color applied to framework control highlights (ex. ripples, list selectors). --> + <attr name="colorControlHighlight" format="color" /> + + <!-- The color applied to framework buttons in their normal state. --> + <attr name="colorButtonNormal" format="color" /> + </declare-styleable> <declare-styleable name="MenuView"> diff --git a/current/support/v7/appcompat/res/values/bools.xml b/current/support/v7/appcompat/res/values/bools.xml index 004d947..4c3c450 100644 --- a/current/support/v7/appcompat/res/values/bools.xml +++ b/current/support/v7/appcompat/res/values/bools.xml @@ -15,6 +15,8 @@ --> <resources> + + <bool name="abc_action_bar_embed_tabs">true</bool> <bool name="abc_action_bar_embed_tabs_pre_jb">false</bool> <bool name="abc_action_bar_expanded_action_views_exclusive">true</bool> <bool name="abc_split_action_bar_is_narrow">true</bool> diff --git a/current/support/v7/appcompat/res/values/colors_material.xml b/current/support/v7/appcompat/res/values/colors_material.xml new file mode 100644 index 0000000..bdbfc8e --- /dev/null +++ b/current/support/v7/appcompat/res/values/colors_material.xml @@ -0,0 +1,164 @@ +<?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. +--> + +<!-- Colors specific to Quantum themes. --> +<resources> + <color name="background_material_dark">#ff212121</color> + <color name="background_material_light">#fffafafa</color> + + <color name="ripple_material_light">#20444444</color> + <color name="ripple_material_dark">#20ffffff</color> + + <color name="button_material_dark">#ff5a595b</color> + <color name="button_material_light">#ffd6d7d7</color> + + <color name="bright_foreground_material_dark">@android:color/white</color> + <color name="bright_foreground_material_light">@android:color/black</color> + <!-- White 50% --> + <color name="bright_foreground_disabled_material_dark">#80ffffff</color> + <!-- Black 50% --> + <color name="bright_foreground_disabled_material_light">#80000000</color> + <color name="bright_foreground_inverse_material_dark">@color/bright_foreground_material_light</color> + <color name="bright_foreground_inverse_material_light">@color/bright_foreground_material_dark</color> + + <color name="dim_foreground_material_dark">#ffbebebe</color> + <color name="dim_foreground_material_light">#ff323232</color> + <color name="dim_foreground_disabled_material_dark">#80bebebe</color> + <color name="dim_foreground_disabled_material_light">#80323232</color> + + <color name="hint_foreground_material_dark">@color/bright_foreground_disabled_material_dark</color> + <color name="hint_foreground_material_light">@color/bright_foreground_disabled_material_light</color> + <!-- TODO: This is 40% alpha on the default accent color. --> + <color name="highlighted_text_material_dark">#6640c4ff</color> + <!-- TODO: This is 40% alpha on the default accent color. --> + <color name="highlighted_text_material_light">#6640c4ff</color> + + <!-- Text & foreground colors --> + <eat-comment /> + + <!-- Black 87% --> + <color name="primary_text_default_material_light">#de000000</color> + <!-- Black 43% --> + <color name="primary_text_disabled_default_material_light">#6e000000</color> + <!-- Black 54% --> + <color name="secondary_text_material_light">#8a000000</color> + <!-- Black 54% (TODO: same as secondary?) --> + <color name="tertiary_text_material_light">#8a000000</color> + + <!-- White 87% --> + <color name="primary_text_default_material_dark">#deffffff</color> + <!-- White 43% --> + <color name="primary_text_disabled_default_material_dark">#6effffff</color> + <!-- White 38% --> + <color name="secondary_text_material_dark">#61ffffff</color> + <!-- White 38% (TODO: same as secondary?) --> + <color name="tertiary_text_material_dark">#61ffffff</color> + + <!-- Primary & accent colors --> + <eat-comment /> + + <color name="material_red_100">#fff4c7c3</color> + <color name="material_red_300">#ffe67c73</color> + <color name="material_red_500">#ffdb4437</color> + <color name="material_red_700">#ffc53929</color> + <color name="material_red_A200">#ffff5252</color> + <color name="material_red_A400">#ffff1744</color> + + <color name="material_blue_100">#ffc6dafc</color> + <color name="material_blue_300">#ff7baaf7</color> + <color name="material_blue_500">#ff4285f4</color> + <color name="material_blue_700">#ff3367d6</color> + <color name="material_blue_A200">#ff448aff</color> + <color name="material_blue_A400">#ff2979ff</color> + + <color name="material_light_blue_A200">#ff40c4ff</color> + + <color name="material_teal_100">#ffb2ebf2</color> + <color name="material_teal_300">#ff4dd0e1</color> + <color name="material_teal_500">#ff00bcd4</color> + <color name="material_teal_700">#ff0097a7</color> + <color name="material_teal_A200">#ff18ffff</color> + <color name="material_teal_A400">#ff00e5ff</color> + + <!-- Accent color used by Settings --> + <color name="material_dark_teal_A400">#ff009688</color> + + <color name="material_green_100">#ffb7e1cd</color> + <color name="material_green_300">#ff57bb8a</color> + <color name="material_green_500">#ff0f9d58</color> + <color name="material_green_700">#ff0b8043</color> + <color name="material_green_A200">#ff69f0ae</color> + <color name="material_green_A400">#ff00e676</color> + + <color name="material_lime_100">#fff0f4c3</color> + <color name="material_lime_300">#ffdce775</color> + <color name="material_lime_500">#ffcddc39</color> + <color name="material_lime_700">#ffafb42b</color> + <color name="material_lime_A200">#ffeeff41</color> + <color name="material_lime_A400">#ffc6ff00</color> + + <color name="material_yellow_100">#fffce8b2</color> + <color name="material_yellow_300">#fff7cb4d</color> + <color name="material_yellow_500">#fff4b400</color> + <color name="material_yellow_700">#fff09300</color> + <color name="material_yellow_A200">#ffffcd40</color> + <color name="material_yellow_A400">#ffffbc00</color> + + <color name="material_orange_100">#ffffe0b2</color> + <color name="material_orange_300">#ffffb74d</color> + <color name="material_orange_500">#ffff9800</color> + <color name="material_orange_700">#fff57c00</color> + <color name="material_orange_A200">#ffffab40</color> + <color name="material_orange_A400">#ffff9100</color> + + <color name="material_deep_orange_100">#fff4c7c3</color> + <color name="material_deep_orange_300">#ffe67c73</color> + <color name="material_deep_orange_500">#ffff5722</color> + <color name="material_deep_orange_700">#ffc53929</color> + <color name="material_deep_orange_A200">#ffff5252</color> + <color name="material_deep_orange_A400">#ffff1744</color> + + <!-- Neutral colors --> + <eat-comment /> + + <color name="material_grey_50">#fffafafa</color> + <color name="material_grey_100">#fff5f5f5</color> + <color name="material_grey_300">#ffeeeeee</color> + <color name="material_grey_500">#ffa3a3a3</color> + <color name="material_grey_600">#ff757575</color> + <color name="material_grey_700">#ff717171</color> + <color name="material_grey_900">#ff212121</color> + + <color name="material_blue_grey_50">#ffeceff1</color> + <color name="material_blue_grey_100">#ffcfd8dc</color> + <color name="material_blue_grey_300">#ff90a4ae</color> + <color name="material_blue_grey_400">#ff78909c</color> + <color name="material_blue_grey_500">#ff607d8b</color> + <color name="material_blue_grey_600">#ff546e7a</color> + <color name="material_blue_grey_700">#ff455a64</color> + <color name="material_blue_grey_800">#ff37474f</color> + <!-- Primary color used by Settings --> + <color name="material_blue_grey_900">#ff263238</color> + <!-- Primary dark color used by Settings --> + <color name="material_blue_grey_950">#ff21272b</color> + + <color name="material_brown_100">#ffd7ccc8</color> + <color name="material_brown_300">#ffa1887f</color> + <color name="material_brown_500">#ff795548</color> + <color name="material_brown_700">#ff5d4037</color> + +</resources>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values/config.xml b/current/support/v7/appcompat/res/values/config.xml index 8c027d1..0f8b7dc 100644 --- a/current/support/v7/appcompat/res/values/config.xml +++ b/current/support/v7/appcompat/res/values/config.xml @@ -31,4 +31,9 @@ Defaults to true. If this is not appropriate for specific locales it should be disabled in that locale's resources. --> <bool name="abc_config_actionMenuItemAllCaps">true</bool> + + <!-- The duration (in milliseconds) of the activity open/close and fragment open/close animations. --> + <integer name="abc_config_activityShortDur">150</integer> + <integer name="abc_config_activityDefaultDur">220</integer> + </resources>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values/dimens.xml b/current/support/v7/appcompat/res/values/dimens.xml index c2cf3a3..2672afd 100644 --- a/current/support/v7/appcompat/res/values/dimens.xml +++ b/current/support/v7/appcompat/res/values/dimens.xml @@ -26,8 +26,6 @@ a few are present. --> <dimen name="abc_action_bar_stacked_tab_max_width">180dp</dimen> - <!-- Default height of an action bar. --> - <dimen name="abc_action_bar_default_height">48dip</dimen> <!-- Vertical padding around action bar icons. --> <dimen name="abc_action_bar_icon_vertical_padding">8dip</dimen> <!-- Text size for action bar titles --> diff --git a/current/support/v7/appcompat/res/values/dimens_material.xml b/current/support/v7/appcompat/res/values/dimens_material.xml new file mode 100644 index 0000000..3ef941b --- /dev/null +++ b/current/support/v7/appcompat/res/values/dimens_material.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + + <!-- Default height of an action bar. --> + <dimen name="abc_action_bar_default_height_material">56dp</dimen> + + <dimen name="abc_action_button_min_width_material">48dp</dimen> + <dimen name="abc_action_button_min_height_material">48dp</dimen> + <dimen name="abc_action_overflow_min_width_material">36dp</dimen> + + <dimen name="text_size_display_4_material">112sp</dimen> + <dimen name="text_size_display_3_material">56sp</dimen> + <dimen name="text_size_display_2_material">45sp</dimen> + <dimen name="text_size_display_1_material">34sp</dimen> + <dimen name="text_size_headline_material">24sp</dimen> + <dimen name="text_size_title_material">20sp</dimen> + <dimen name="text_size_subhead_material">16sp</dimen> + <dimen name="text_size_body_2_material">14sp</dimen> + <dimen name="text_size_body_1_material">14sp</dimen> + <dimen name="text_size_caption_material">12sp</dimen> + <dimen name="text_size_menu_material">14sp</dimen> + <dimen name="text_size_button_material">14sp</dimen> + + <!-- Text size for action bar titles --> + <dimen name="abc_action_bar_title_text_size_material">20sp</dimen> + <!-- Text size for action bar subtitles --> + <dimen name="abc_action_bar_subtitle_text_size_material">16sp</dimen> + +</resources>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values/ids.xml b/current/support/v7/appcompat/res/values/ids.xml index ebeed83..e54b834 100644 --- a/current/support/v7/appcompat/res/values/ids.xml +++ b/current/support/v7/appcompat/res/values/ids.xml @@ -15,6 +15,7 @@ --> <resources> <item type="id" name="home"/> + <item type="id" name="up"/> <item type="id" name="action_bar_activity_content"/> <item type="id" name="action_menu_divider"/> <item type="id" name="action_menu_presenter"/> diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml index 94d2e88..5c9ee76 100644 --- a/current/support/v7/appcompat/res/values/styles.xml +++ b/current/support/v7/appcompat/res/values/styles.xml @@ -17,229 +17,273 @@ <resources> <!-- Styles in here can be extended for customisation in your application. Each utilises - one of the Base styles. If Holo themes are available on the current platform version + one of the.styles. If Holo themes are available on the current platform version they will be used instead of the compat styles. --> - <style name="Widget.AppCompat.ActionBar" parent="Widget.AppCompat.Base.ActionBar"> + <style name="Widget.AppCompat.ActionBar" parent="Base.Widget.AppCompat.ActionBar"> </style> - <style name="Widget.AppCompat.Light.ActionBar" parent="Widget.AppCompat.Light.Base.ActionBar"> + <style name="Widget.AppCompat.Light.ActionBar" parent="Base.Widget.AppCompat.Light.ActionBar"> </style> <style name="Widget.AppCompat.ActionBar.Solid" - parent="Widget.AppCompat.Base.ActionBar.Solid"> + parent="Base.Widget.AppCompat.ActionBar.Solid"> </style> <style name="Widget.AppCompat.Light.ActionBar.Solid" - parent="Widget.AppCompat.Light.Base.ActionBar.Solid"> + parent="Base.Widget.AppCompat.Light.ActionBar.Solid"> </style> <style name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.Solid.Inverse"> + parent="Base.Widget.AppCompat.Light.ActionBar.Solid.Inverse"> </style> <style name="TextAppearance.AppCompat.Widget.ActionBar.Title" - parent="TextAppearance.AppCompat.Widget.Base.ActionBar.Title"> + parent="Base.TextAppearance.AppCompat.Widget.ActionBar.Title"> </style> <style name="TextAppearance.AppCompat.Widget.ActionBar.Subtitle" - parent="TextAppearance.AppCompat.Widget.Base.ActionBar.Subtitle"> + parent="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle"> </style> <style name="TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" - parent="TextAppearance.AppCompat.Widget.Base.ActionBar.Title.Inverse"> + parent="Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"> </style> <style name="TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" - parent="TextAppearance.AppCompat.Widget.Base.ActionBar.Subtitle.Inverse"> + parent="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"> </style> <style name="Widget.AppCompat.ProgressBar.Horizontal" - parent="Widget.AppCompat.Base.ProgressBar.Horizontal"> + parent="Base.Widget.AppCompat.ProgressBar.Horizontal"> </style> <style name="Widget.AppCompat.ProgressBar" - parent="Widget.AppCompat.Base.ProgressBar"> + parent="Base.Widget.AppCompat.ProgressBar"> </style> - <style name="Widget.AppCompat.ActionButton" parent="Widget.AppCompat.Base.ActionButton"> + <style name="Widget.AppCompat.ActionButton" parent="Base.Widget.AppCompat.ActionButton"> </style> <style name="Widget.AppCompat.Light.ActionButton" - parent="Widget.AppCompat.Light.Base.ActionButton"> + parent="Base.Widget.AppCompat.Light.ActionButton"> </style> <style name="Widget.AppCompat.ActionButton.CloseMode" - parent="Widget.AppCompat.Base.ActionButton.CloseMode"> + parent="Base.Widget.AppCompat.ActionButton.CloseMode"> </style> <style name="Widget.AppCompat.Light.ActionButton.CloseMode" - parent="Widget.AppCompat.Light.Base.ActionButton.CloseMode"> + parent="Base.Widget.AppCompat.Light.ActionButton.CloseMode"> </style> <style name="Widget.AppCompat.ActionButton.Overflow" - parent="Widget.AppCompat.Base.ActionButton.Overflow"> + parent="Base.Widget.AppCompat.ActionButton.Overflow"> </style> <style name="Widget.AppCompat.Light.ActionButton.Overflow" - parent="Widget.AppCompat.Light.Base.ActionButton.Overflow"> + parent="Base.Widget.AppCompat.Light.ActionButton.Overflow"> </style> - <style name="Widget.AppCompat.ActionBar.TabBar" parent="Widget.AppCompat.Base.ActionBar.TabBar"> + <style name="Widget.AppCompat.ActionBar.TabBar" + parent="Base.Widget.AppCompat.ActionBar.TabBar"> </style> <style name="Widget.AppCompat.Light.ActionBar.TabBar" - parent="Widget.AppCompat.Light.Base.ActionBar.TabBar"> + parent="Base.Widget.AppCompat.Light.ActionBar.TabBar"> </style> <style name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.TabBar.Inverse"></style> + parent="Base.Widget.AppCompat.Light.ActionBar.TabBar.Inverse"> + </style> <style name="Widget.AppCompat.ActionBar.TabView" - parent="Widget.AppCompat.Base.ActionBar.TabView"> + parent="Base.Widget.AppCompat.ActionBar.TabView"> </style> <style name="Widget.AppCompat.Light.ActionBar.TabView" - parent="Widget.AppCompat.Light.Base.ActionBar.TabView"> + parent="Base.Widget.AppCompat.Light.ActionBar.TabView"> </style> <style name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.TabView.Inverse"> + parent="Base.Widget.AppCompat.Light.ActionBar.TabView.Inverse"> </style> <style name="Widget.AppCompat.ActionBar.TabText" - parent="Widget.AppCompat.Base.ActionBar.TabText"> + parent="Base.Widget.AppCompat.ActionBar.TabText"> </style> <style name="Widget.AppCompat.Light.ActionBar.TabText" - parent="Widget.AppCompat.Light.Base.ActionBar.TabText"> + parent="Base.Widget.AppCompat.Light.ActionBar.TabText"> </style> <style name="Widget.AppCompat.Light.ActionBar.TabText.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.TabText.Inverse"> + parent="Base.Widget.AppCompat.Light.ActionBar.TabText.Inverse"> </style> <style name="TextAppearance.AppCompat.Widget.ActionBar.Menu" - parent="TextAppearance.AppCompat.Widget.Base.ActionBar.Menu"> + parent="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu"> </style> - <style name="Widget.AppCompat.ActionMode" parent="Widget.AppCompat.Base.ActionMode"> + <style name="Widget.AppCompat.ActionMode" parent="Base.Widget.AppCompat.ActionMode"> </style> <style name="Widget.AppCompat.Light.ActionMode.Inverse" - parent="Widget.AppCompat.Light.Base.ActionMode.Inverse"> + parent="Base.Widget.AppCompat.Light.ActionMode.Inverse"> </style> <style name="TextAppearance.AppCompat.Widget.ActionMode.Title" - parent="TextAppearance.AppCompat.Widget.Base.ActionMode.Title"> + parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Title"> </style> <style name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle" - parent="TextAppearance.AppCompat.Widget.Base.ActionMode.Subtitle"> + parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle"> </style> <style name="TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" - parent="TextAppearance.AppCompat.Widget.Base.ActionMode.Title.Inverse"> + parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse"> </style> <style name="TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" - parent="TextAppearance.AppCompat.Widget.Base.ActionMode.Subtitle.Inverse"> + parent="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse"> </style> <style name="TextAppearance.AppCompat.Widget.DropDownItem" - parent="TextAppearance.AppCompat.Widget.Base.DropDownItem"> + parent="Base.TextAppearance.AppCompat.Widget.DropDownItem"> </style> <style name="Widget.AppCompat.Spinner.DropDown.ActionBar" - parent="Widget.AppCompat.Base.Spinner"> + parent="Base.Widget.AppCompat.Spinner"> </style> <style name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" - parent="Widget.AppCompat.Light.Base.Spinner"> + parent="Base.Widget.AppCompat.Light.Spinner"> </style> <style name="Widget.AppCompat.DropDownItem.Spinner" - parent="Widget.AppCompat.Base.DropDownItem.Spinner"> + parent="Base.Widget.AppCompat.DropDownItem.Spinner"> </style> + <style name="Widget.AppCompat.Light.DropDownItem.Spinner" - parent="Widget.AppCompat.Light.Base.DropDownItem.Spinner"> + parent="Base.Widget.AppCompat.Light.DropDownItem.Spinner"> </style> <style name="Widget.AppCompat.ListView.DropDown" - parent="Widget.AppCompat.Base.ListView.DropDown"> + parent="Base.Widget.AppCompat.ListView.DropDown"> </style> <style name="Widget.AppCompat.Light.ListView.DropDown" - parent="Widget.AppCompat.Light.Base.ListView.DropDown"> + parent="Base.Widget.AppCompat.Light.ListView.DropDown"> </style> <style name="TextAppearance.Widget.AppCompat.ExpandedMenu.Item" - parent="TextAppearance.Widget.AppCompat.Base.ExpandedMenu.Item"> + parent="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item"> </style> - <style name="Widget.AppCompat.ListPopupWindow" parent="Widget.AppCompat.Base.ListPopupWindow"> + <style name="Widget.AppCompat.ListPopupWindow" parent="Base.Widget.AppCompat.ListPopupWindow"> </style> <style name="Widget.AppCompat.Light.ListPopupWindow" - parent="Widget.AppCompat.Light.Base.ListPopupWindow"> + parent="Base.Widget.AppCompat.Light.ListPopupWindow"> </style> - <style name="Widget.AppCompat.PopupMenu" parent="Widget.AppCompat.Base.PopupMenu"> + <style name="Widget.AppCompat.PopupMenu" parent="Base.Widget.AppCompat.PopupMenu"> </style> <style name="Widget.AppCompat.Light.PopupMenu" - parent="Widget.AppCompat.Light.Base.PopupMenu"> + parent="Base.Widget.AppCompat.Light.PopupMenu"> </style> - <style name="Widget.AppCompat.ListView.Menu" parent="Widget.AppCompat.Base.ListView.Menu"> + <style name="Widget.AppCompat.ListView.Menu" parent="Base.Widget.AppCompat.ListView.Menu"> </style> <style name="TextAppearance.AppCompat.Widget.PopupMenu.Large" - parent="TextAppearance.AppCompat.Base.Widget.PopupMenu.Large"> + parent="Base.TextAppearance.AppCompat.Widget.PopupMenu.Large"> </style> <style name="TextAppearance.AppCompat.Widget.PopupMenu.Small" - parent="TextAppearance.AppCompat.Base.Widget.PopupMenu.Small"> + parent="Base.TextAppearance.AppCompat.Widget.PopupMenu.Small"> </style> <style name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" - parent="TextAppearance.AppCompat.Light.Base.Widget.PopupMenu.Large"> + parent="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large"> </style> <style name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" - parent="TextAppearance.AppCompat.Light.Base.Widget.PopupMenu.Small"> + parent="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small"> </style> <style name="TextAppearance.AppCompat.SearchResult.Title" - parent="TextAppearance.AppCompat.Base.SearchResult.Title"> + parent="Base.TextAppearance.AppCompat.SearchResult.Title"> </style> <style name="TextAppearance.AppCompat.SearchResult.Subtitle" - parent="TextAppearance.AppCompat.Base.SearchResult.Subtitle"> + parent="Base.TextAppearance.AppCompat.SearchResult.Subtitle"> </style> <style name="TextAppearance.AppCompat.Light.SearchResult.Title" - parent="TextAppearance.AppCompat.Light.Base.SearchResult.Title"> + parent="Base.TextAppearance.AppCompat.Light.SearchResult.Title"> </style> <style name="TextAppearance.AppCompat.Light.SearchResult.Subtitle" - parent="TextAppearance.AppCompat.Light.Base.SearchResult.Subtitle"> + parent="Base.TextAppearance.AppCompat.Light.SearchResult.Subtitle"> </style> <style name="Widget.AppCompat.AutoCompleteTextView" - parent="Widget.AppCompat.Base.AutoCompleteTextView"> + parent="Base.Widget.AppCompat.AutoCompleteTextView"> </style> <style name="Widget.AppCompat.Light.AutoCompleteTextView" - parent="Widget.AppCompat.Light.Base.AutoCompleteTextView"> + parent="Base.Widget.AppCompat.Light.AutoCompleteTextView"> </style> <style name="Widget.AppCompat.ActivityChooserView" - parent="Widget.AppCompat.Base.ActivityChooserView"> + parent="Base.Widget.AppCompat.ActivityChooserView"> </style> <style name="Widget.AppCompat.Light.ActivityChooserView" - parent="Widget.AppCompat.Light.Base.ActivityChooserView"> + parent="Base.Widget.AppCompat.Light.ActivityChooserView"> </style> + <eat-comment /> + <!-- Text styles --> + + <style name="TextAppearance.AppCompat" parent="Base.TextAppearance.AppCompat" /> + + <style name="TextAppearance.AppCompat.Display4" parent="Base.TextAppearance.AppCompat.Display4" /> + + <style name="TextAppearance.AppCompat.Display3" parent="Base.TextAppearance.AppCompat.Display3" /> + + <style name="TextAppearance.AppCompat.Display2" parent="Base.TextAppearance.AppCompat.Display2" /> + + <style name="TextAppearance.AppCompat.Display1" parent="Base.TextAppearance.AppCompat.Display1" /> + + <style name="TextAppearance.AppCompat.Headline" parent="Base.TextAppearance.AppCompat.Headline" /> + + <style name="TextAppearance.AppCompat.Title" parent="Base.TextAppearance.AppCompat.Title" /> + + <style name="TextAppearance.AppCompat.Subhead" parent="Base.TextAppearance.AppCompat.Subhead" /> + + <style name="TextAppearance.AppCompat.Body2" parent="Base.TextAppearance.AppCompat.Body2" /> + + <style name="TextAppearance.AppCompat.Body1" parent="Base.TextAppearance.AppCompat.Body1" /> + + <style name="TextAppearance.AppCompat.Caption" parent="Base.TextAppearance.AppCompat.Caption" /> + + <style name="TextAppearance.AppCompat.Menu" parent="Base.TextAppearance.AppCompat.Menu" /> + + <style name="TextAppearance.AppCompat.Inverse" parent="Base.TextAppearance.AppCompat.Inverse" /> + + <style name="TextAppearance.AppCompat.Large" parent="Base.TextAppearance.AppCompat.Large" /> + + <style name="TextAppearance.AppCompat.Large.Inverse" parent="Base.TextAppearance.AppCompat.Large.Inverse" /> + + <style name="TextAppearance.AppCompat.Medium" parent="Base.TextAppearance.AppCompat.Medium" /> + + <style name="TextAppearance.AppCompat.Medium.Inverse" parent="Base.TextAppearance.AppCompat.Medium.Inverse" /> + + <style name="TextAppearance.AppCompat.Small" parent="Base.TextAppearance.AppCompat.Small" /> + + <style name="TextAppearance.AppCompat.Small.Inverse" parent="Base.TextAppearance.AppCompat.Small.Inverse" /> + </resources> diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml index 79dd732..ab268cd 100644 --- a/current/support/v7/appcompat/res/values/styles_base.xml +++ b/current/support/v7/appcompat/res/values/styles_base.xml @@ -16,154 +16,139 @@ <resources> - <!-- Like in themes_base.xml, the namespace "*.AppCompat.Base" is used to + <!-- Like in themes_base.xml, the namespace "Base.AppCompat.*" is used to define base styles for the platform version. The "*.AppCompat" variants are for direct use or use as parent styles by the app. --> <eat-comment/> - <style name="Widget.AppCompat.Base.ActionBar" parent=""> - <item name="displayOptions">useLogo|showHome|showTitle</item> + <style name="Base.Widget.AppCompat.ActionBar" parent=""> + <item name="displayOptions">showTitle</item> <item name="divider">?attr/dividerVertical</item> <item name="height">?attr/actionBarSize</item> <item name="homeLayout">@layout/abc_action_bar_home</item> <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item> - <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle - </item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item> - <item name="background">@drawable/abc_ab_transparent_dark_holo</item> - <item name="backgroundStacked">@drawable/abc_ab_stacked_transparent_dark_holo</item> - <item name="backgroundSplit">@drawable/abc_ab_bottom_transparent_dark_holo</item> + <item name="background">@null</item> + <item name="backgroundStacked">@null</item> + <item name="backgroundSplit">@null</item> <item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item> <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item> <item name="progressBarStyle">@style/Widget.AppCompat.ProgressBar.Horizontal</item> <item name="indeterminateProgressStyle">@style/Widget.AppCompat.ProgressBar</item> - </style> - <style name="Widget.AppCompat.Light.Base.ActionBar" parent="Widget.AppCompat.Base.ActionBar"> - <item name="background">@drawable/abc_ab_transparent_light_holo</item> - <item name="backgroundStacked">@drawable/abc_ab_stacked_transparent_light_holo</item> - <item name="backgroundSplit">@drawable/abc_ab_bottom_transparent_light_holo</item> + <item name="android:gravity">center_vertical</item> - <item name="actionButtonStyle">@style/Widget.AppCompat.Light.ActionButton</item> - <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.Light.ActionButton.Overflow - </item> + </style> - <item name="progressBarStyle">@style/Widget.AppCompat.ProgressBar.Horizontal</item> - <item name="indeterminateProgressStyle">@style/Widget.AppCompat.ProgressBar</item> + <style name="Base.Widget.AppCompat.Light.ActionBar" parent="Base.Widget.AppCompat.ActionBar"> + <item name="actionButtonStyle">@style/Widget.AppCompat.Light.ActionButton</item> + <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.Light.ActionButton.Overflow</item> </style> - <style name="Widget.AppCompat.Base.ActionBar.Solid" parent="Widget.AppCompat.Base.ActionBar"> - <item name="background">@drawable/abc_ab_solid_dark_holo</item> - <item name="backgroundStacked">@drawable/abc_ab_stacked_solid_dark_holo</item> - <item name="backgroundSplit">@drawable/abc_ab_bottom_solid_dark_holo</item> + <style name="Base.Widget.AppCompat.ActionBar.Solid"> + <item name="background">?attr/colorPrimary</item> + <item name="backgroundStacked">?attr/colorPrimary</item> + <item name="backgroundSplit">?attr/colorPrimary</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.Solid" - parent="Widget.AppCompat.Light.Base.ActionBar"> - <item name="background">@drawable/abc_ab_solid_light_holo</item> - <item name="backgroundStacked">@drawable/abc_ab_stacked_solid_light_holo</item> - <item name="backgroundSplit">@drawable/abc_ab_bottom_solid_light_holo</item> + <style name="Base.Widget.AppCompat.Light.ActionBar.Solid"> + <item name="background">?attr/colorPrimary</item> + <item name="backgroundStacked">?attr/colorPrimary</item> + <item name="backgroundSplit">?attr/colorPrimary</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.Solid.Inverse" - parent="Widget.AppCompat.Base.ActionBar.Solid"> - <item name="titleTextStyle"> - @style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse - </item> - <item name="subtitleTextStyle"> - @style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse - </item> - <item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item> - <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow - </item> + <style name="Base.Widget.AppCompat.Light.ActionBar.Solid.Inverse"> + <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item> </style> - <style name="Widget.AppCompat.Base.ActionButton" parent=""> + <style name="Base.Widget.AppCompat.ActionButton" parent=""> <item name="android:background">?attr/actionBarItemBackground</item> <item name="android:paddingLeft">12dip</item> <item name="android:paddingRight">12dip</item> - <item name="android:minWidth">@dimen/abc_action_button_min_width</item> - <item name="android:minHeight">?attr/actionBarSize</item> + <item name="android:minWidth">@dimen/abc_action_button_min_width_material</item> + <item name="android:minHeight">@dimen/abc_action_button_min_height_material</item> + <item name="android:scaleType">center</item> <item name="android:gravity">center</item> <item name="android:maxLines">2</item> <item name="textAllCaps">@bool/abc_config_actionMenuItemAllCaps</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionButton" - parent="Widget.AppCompat.Base.ActionButton"> + <style name="Base.Widget.AppCompat.Light.ActionButton" parent="Base.Widget.AppCompat.ActionButton"> </style> - <style name="Widget.AppCompat.Base.ActionButton.CloseMode" - parent="Widget.AppCompat.Base.ActionButton"> + <style name="Base.Widget.AppCompat.ActionButton.CloseMode" parent="Base.Widget.AppCompat.ActionButton"> </style> - <style name="Widget.AppCompat.Light.Base.ActionButton.CloseMode" - parent="Widget.AppCompat.Light.Base.ActionButton"> + <style name="Base.Widget.AppCompat.Light.ActionButton.CloseMode" parent="Base.Widget.AppCompat.Light.ActionButton"> </style> - <style name="Widget.AppCompat.Base.ActionButton.Overflow" - parent="Widget.AppCompat.Base.ActionButton"> - <item name="android:src">@drawable/abc_ic_menu_moreoverflow_normal_holo_dark</item> + <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:minWidth">@dimen/abc_action_overflow_min_width_material</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionButton.Overflow" - parent="Widget.AppCompat.Light.Base.ActionButton"> - <item name="android:src">@drawable/abc_ic_menu_moreoverflow_normal_holo_light</item> + <style name="Base.Widget.AppCompat.Light.ActionButton.Overflow" parent="Base.Widget.AppCompat.Light.ActionButton"> + <item name="android:src">@drawable/abc_ic_menu_moreoverflow_material_light</item> + <item name="android:minWidth">@dimen/abc_action_overflow_min_width_material</item> </style> - <style name="Widget.AppCompat.Base.ActionBar.TabBar" parent=""> + <style name="Base.Widget.AppCompat.ActionBar.TabBar" parent=""> <item name="divider">?attr/actionBarDivider</item> <item name="showDividers">middle</item> - <item name="dividerPadding">12dip</item> + <item name="dividerPadding">8dip</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.TabBar" - parent="Widget.AppCompat.Base.ActionBar.TabBar"> + <style name="Base.Widget.AppCompat.Light.ActionBar.TabBar" + parent="Base.Widget.AppCompat.ActionBar.TabBar"> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.TabBar.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.TabBar"> + <style name="Base.Widget.AppCompat.Light.ActionBar.TabBar.Inverse" + parent="Base.Widget.AppCompat.Light.ActionBar.TabBar"> </style> - <style name="Widget.AppCompat.Base.ActionBar.TabView" parent=""> - <item name="android:background">@drawable/abc_tab_indicator_ab_holo</item> + <style name="Base.Widget.AppCompat.ActionBar.TabView" parent=""> + <item name="android:background">@drawable/abc_tab_indicator_material</item> <item name="android:gravity">center_horizontal</item> <item name="android:paddingLeft">16dip</item> <item name="android:paddingRight">16dip</item> + <item name="android:layout_width">0dip</item> + <item name="android:layout_weight">1</item> <item name="android:minWidth">80dip</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.TabView" - parent="Widget.AppCompat.Base.ActionBar.TabView"> + <style name="Base.Widget.AppCompat.Light.ActionBar.TabView" + parent="Base.Widget.AppCompat.ActionBar.TabView"> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.TabView.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.TabView"> + <style name="Base.Widget.AppCompat.Light.ActionBar.TabView.Inverse" + parent="Base.Widget.AppCompat.Light.ActionBar.TabView"> </style> - <style name="Widget.AppCompat.Base.ActionBar.TabText" parent=""> - <item name="android:textAppearance">@null</item> - <item name="android:textColor">?android:attr/textColorPrimaryDisableOnly</item> + <style name="Base.Widget.AppCompat.ActionBar.TabText" parent=""> + <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item> <item name="android:textSize">12sp</item> <item name="android:textStyle">bold</item> <item name="android:ellipsize">marquee</item> <item name="android:maxLines">2</item> + <item name="android:maxWidth">180dp</item> <item name="textAllCaps">true</item> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.TabText" - parent="Widget.AppCompat.Base.ActionBar.TabText"> + <style name="Base.Widget.AppCompat.Light.ActionBar.TabText" + parent="Base.Widget.AppCompat.ActionBar.TabText"> </style> - <style name="Widget.AppCompat.Light.Base.ActionBar.TabText.Inverse" - parent="Widget.AppCompat.Light.Base.ActionBar.TabText"> - <item name="android:textColor">?android:attr/textColorPrimaryInverseDisableOnly</item> + <style name="Base.Widget.AppCompat.Light.ActionBar.TabText.Inverse" + parent="Base.Widget.AppCompat.Light.ActionBar.TabText"> + <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium.Inverse</item> </style> - <style name="Widget.AppCompat.Base.ActionMode" parent=""> + <style name="Base.Widget.AppCompat.ActionMode" parent=""> <item name="background">?attr/actionModeBackground</item> <item name="backgroundSplit">?attr/actionModeSplitBackground</item> <item name="height">?attr/actionBarSize</item> @@ -172,66 +157,53 @@ </item> </style> - <style name="Widget.AppCompat.Light.Base.ActionMode.Inverse" - parent="Widget.AppCompat.Base.ActionMode"> - <item name="titleTextStyle"> - @style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse - </item> - <item name="subtitleTextStyle"> - @style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse - </item> + <style name="Base.Widget.AppCompat.Light.ActionMode.Inverse" parent="Base.Widget.AppCompat.ActionMode"> + <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Title" - parent="android:TextAppearance.Medium"> + <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title" parent="TextAppearance.AppCompat.Medium"> + <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Subtitle" - parent="android:TextAppearance.Small"> - <item name="android:textColor">?android:attr/textColorSecondary</item> + <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle" parent="TextAppearance.AppCompat.Small"> + <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Title.Inverse" - parent="android:TextAppearance.Medium.Inverse"> + <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse" parent="TextAppearance.AppCompat.Medium.Inverse"> + <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Subtitle.Inverse" - parent="android:TextAppearance.Small.Inverse"> - <item name="android:textColor">?android:attr/textColorSecondaryInverse</item> + <style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.AppCompat.Small.Inverse"> + <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Menu" - parent="android:TextAppearance.Small"> + <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" parent="android:TextAppearance.Small"> <item name="android:textSize">12sp</item> <item name="android:textStyle">bold</item> <item name="android:textColor">?attr/actionMenuTextColor</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Title" - parent="android:TextAppearance.Medium"> - <item name="android:textSize">@dimen/abc_action_bar_title_text_size</item> + <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title" parent="TextAppearance.AppCompat.Medium"> + <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Subtitle" - parent="android:TextAppearance.Small"> - <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size</item> + <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" parent="TextAppearance.AppCompat.Small"> + <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Title.Inverse" - parent="android:TextAppearance.Medium.Inverse"> - <item name="android:textSize">@dimen/abc_action_bar_title_text_size</item> + <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" parent="TextAppearance.AppCompat.Medium.Inverse"> + <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Subtitle.Inverse" - parent="android:TextAppearance.Small.Inverse"> - <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size</item> + <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.AppCompat.Small.Inverse"> + <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item> </style> - <style name="Widget.AppCompat.Base.ProgressBar.Horizontal" - parent="android:Widget.ProgressBar.Horizontal"> + <style name="Base.Widget.AppCompat.ProgressBar.Horizontal" parent="android:Widget.ProgressBar.Horizontal"> </style> - <style name="Widget.AppCompat.Base.ProgressBar" parent="android:Widget.ProgressBar"> + <style name="Base.Widget.AppCompat.ProgressBar" parent="android:Widget.ProgressBar"> <item name="android:minWidth">@dimen/abc_action_bar_progress_bar_size</item> <item name="android:maxWidth">@dimen/abc_action_bar_progress_bar_size</item> <item name="android:minHeight">@dimen/abc_action_bar_progress_bar_size</item> @@ -240,7 +212,7 @@ <!-- Action Bar Spinner Widgets --> - <style name="Widget.AppCompat.Base.Spinner" parent=""> + <style name="Base.Widget.AppCompat.Spinner" parent=""> <item name="spinnerMode">dropdown</item> <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_dark</item> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item> @@ -252,13 +224,13 @@ <item name="android:background">@drawable/abc_spinner_ab_holo_dark</item> </style> - <style name="Widget.AppCompat.Light.Base.Spinner" parent="Widget.AppCompat.Base.Spinner"> + <style name="Base.Widget.AppCompat.Light.Spinner" parent="Base.Widget.AppCompat.Spinner"> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_light</item> <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_light</item> <item name="android:background">@drawable/abc_spinner_ab_holo_light</item> </style> - <style name="Widget.AppCompat.Base.DropDownItem.Spinner" parent=""> + <style name="Base.Widget.AppCompat.DropDownItem.Spinner" parent=""> <item name="android:textAppearance">@style/TextAppearance.AppCompat.Widget.DropDownItem </item> <item name="android:paddingLeft">8dp</item> @@ -266,129 +238,113 @@ <item name="android:gravity">center_vertical</item> </style> - <style name="Widget.AppCompat.Light.Base.DropDownItem.Spinner" - parent="Widget.AppCompat.Base.DropDownItem.Spinner"> + <style name="Base.Widget.AppCompat.Light.DropDownItem.Spinner" + parent="Base.Widget.AppCompat.DropDownItem.Spinner"> </style> - <style name="Widget.AppCompat.Base.ListView.DropDown" parent="android:Widget.ListView"> + <style name="Base.Widget.AppCompat.ListView.DropDown" parent="android:Widget.ListView"> <item name="android:listSelector">@drawable/abc_list_selector_holo_dark</item> </style> - <style name="Widget.AppCompat.Light.Base.ListView.DropDown" + <style name="Base.Widget.AppCompat.Light.ListView.DropDown" parent="android:Widget.ListView"> <item name="android:listSelector">@drawable/abc_list_selector_holo_light</item> </style> - <style name="TextAppearance.AppCompat.Widget.Base.DropDownItem" + <style name="Base.TextAppearance.AppCompat.Widget.DropDownItem" parent="android:TextAppearance.Small"> <item name="android:textColor">?android:attr/textColorPrimaryDisableOnly</item> </style> - <style name="TextAppearance.Widget.AppCompat.Base.ExpandedMenu.Item" + <style name="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item" parent="android:TextAppearance.Medium"> <item name="android:textColor">?android:attr/textColorPrimaryDisableOnly</item> </style> - <!-- Mimic text appearance in select_dialog_item.xml --> - <style name="TextAppearance.AppCompat.Base.CompactMenu.Dialog" - parent="android:TextAppearance.Medium"> - <item name="android:textColor">@android:color/primary_text_light</item> - </style> - - <style name="Widget.AppCompat.Base.ListView.Menu" parent="android:Widget.ListView.Menu"> + <style name="Base.Widget.AppCompat.ListView.Menu" parent="android:Widget.ListView.Menu"> <item name="android:listSelector">?attr/listChoiceBackgroundIndicator</item> <item name="android:divider">?attr/dividerHorizontal</item> </style> - <style name="Widget.AppCompat.Base.ListPopupWindow" parent=""> + <style name="Base.Widget.AppCompat.ListPopupWindow" parent=""> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item> - <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_dark</item> + <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="android:dropDownWidth">wrap_content</item> </style> - <style name="Widget.AppCompat.Light.Base.ListPopupWindow" parent=""> + <style name="Base.Widget.AppCompat.Light.ListPopupWindow" parent=""> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_light</item> - <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_light</item> + <item name="android:popupBackground">@drawable/abc_popup_background_material_light</item> <item name="android:dropDownVerticalOffset">0dip</item> <item name="android:dropDownHorizontalOffset">0dip</item> <item name="android:dropDownWidth">wrap_content</item> </style> - <style name="Widget.AppCompat.Base.PopupMenu" - parent="@style/Widget.AppCompat.Base.ListPopupWindow"> + <style name="Base.Widget.AppCompat.PopupMenu" parent="@style/Widget.AppCompat.ListPopupWindow"> </style> - <style name="Widget.AppCompat.Light.Base.PopupMenu" - parent="@style/Widget.AppCompat.Light.Base.ListPopupWindow"> + <style name="Base.Widget.AppCompat.Light.PopupMenu" parent="@style/Widget.AppCompat.Light.ListPopupWindow"> </style> - <style name="TextAppearance.AppCompat.Base.Widget.PopupMenu.Large" - parent="android:TextAppearance.Widget"> - <item name="android:textColor">?android:attr/textColorPrimaryDisableOnly</item> - <item name="android:textSize">18sp</item> + <style name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Large" parent="TextAppearance.AppCompat.Menu"> </style> - <style name="TextAppearance.AppCompat.Base.Widget.PopupMenu.Small" - parent="android:TextAppearance.Widget"> - <item name="android:textColor">?android:attr/textColorPrimaryDisableOnly</item> - <item name="android:textSize">14sp</item> + <style name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Small" parent="TextAppearance.AppCompat.Menu"> </style> - <style name="TextAppearance.AppCompat.Light.Base.Widget.PopupMenu.Large" - parent="TextAppearance.AppCompat.Base.Widget.PopupMenu.Large"> + <style name="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" parent="TextAppearance.AppCompat.Menu"> </style> - <style name="TextAppearance.AppCompat.Light.Base.Widget.PopupMenu.Small" - parent="TextAppearance.AppCompat.Base.Widget.PopupMenu.Small"> + <style name="Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" parent="TextAppearance.AppCompat.Menu"> </style> - <style name="TextAppearance.AppCompat.Base.SearchResult" parent=""> + <style name="Base.TextAppearance.AppCompat.SearchResult" parent=""> <item name="android:textStyle">normal</item> <item name="android:textColor">?android:textColorPrimary</item> <item name="android:textColorHint">?android:textColorHint</item> </style> - <style name="TextAppearance.AppCompat.Base.SearchResult.Title"> + <style name="Base.TextAppearance.AppCompat.SearchResult.Title"> <item name="android:textSize">18sp</item> </style> - <style name="TextAppearance.AppCompat.Base.SearchResult.Subtitle"> + <style name="Base.TextAppearance.AppCompat.SearchResult.Subtitle"> <item name="android:textSize">14sp</item> <item name="android:textColor">?android:textColorSecondary</item> </style> - <style name="TextAppearance.AppCompat.Light.Base.SearchResult" - parent="TextAppearance.AppCompat.Base.SearchResult"> + <style name="Base.TextAppearance.AppCompat.Light.SearchResult" + parent="Base.TextAppearance.AppCompat.SearchResult"> <item name="android:textColor">?android:textColorPrimary</item> <item name="android:textColorHint">?android:textColorHint</item> </style> - <style name="TextAppearance.AppCompat.Light.Base.SearchResult.Title"> + <style name="Base.TextAppearance.AppCompat.Light.SearchResult.Title"> <item name="android:textSize">18sp</item> </style> - <style name="TextAppearance.AppCompat.Light.Base.SearchResult.Subtitle"> + <style name="Base.TextAppearance.AppCompat.Light.SearchResult.Subtitle"> <item name="android:textSize">14sp</item> <item name="android:textColor">?android:textColorSecondary</item> </style> - <style name="Widget.AppCompat.Base.AutoCompleteTextView" + <style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView"> <item name="android:textColor">?attr/actionMenuTextColor</item> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item> <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_dark</item> </style> - <style name="Widget.AppCompat.Light.Base.AutoCompleteTextView" + <style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView"> <item name="android:textColor">?attr/actionMenuTextColor</item> <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_light</item> <item name="android:popupBackground">@drawable/abc_menu_dropdown_panel_holo_light</item> </style> - <style name="Widget.AppCompat.Base.ActivityChooserView" parent=""> + <style name="Base.Widget.AppCompat.ActivityChooserView" parent=""> <item name="android:gravity">center</item> <item name="android:background">@drawable/abc_ab_share_pack_holo_dark</item> <item name="divider">?attr/dividerVertical</item> @@ -396,8 +352,8 @@ <item name="dividerPadding">6dip</item> </style> - <style name="Widget.AppCompat.Light.Base.ActivityChooserView" - parent="Widget.AppCompat.Base.ActivityChooserView"> + <style name="Base.Widget.AppCompat.Light.ActivityChooserView" + parent="Base.Widget.AppCompat.ActivityChooserView"> <item name="android:background">@drawable/abc_ab_share_pack_holo_light</item> </style> diff --git a/current/support/v7/appcompat/res/values/styles_base_text.xml b/current/support/v7/appcompat/res/values/styles_base_text.xml new file mode 100644 index 0000000..c961645 --- /dev/null +++ b/current/support/v7/appcompat/res/values/styles_base_text.xml @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + + <style name="Base.TextAppearance.AppCompat" parent="android:TextAppearance"> + <item name="android:textColor">?android:textColorPrimary</item> + <item name="android:textColorHint">?android:textColorHint</item> + <item name="android:textColorHighlight">?android:textColorHighlight</item> + <item name="android:textColorLink">?android:textColorLink</item> + <item name="android:textSize">@dimen/text_size_body_1_material</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Display4"> + <item name="android:textSize">@dimen/text_size_display_4_material</item> + <item name="android:textColor">?android:textColorSecondary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Display3"> + <item name="android:textSize">@dimen/text_size_display_3_material</item> + <item name="android:textColor">?android:textColorSecondary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Display2"> + <item name="android:textSize">@dimen/text_size_display_2_material</item> + <item name="android:textColor">?android:textColorSecondary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Display1"> + <item name="android:textSize">@dimen/text_size_display_1_material</item> + <item name="android:textColor">?android:textColorSecondary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Headline"> + <item name="android:textSize">@dimen/text_size_headline_material</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Title"> + <item name="android:textSize">@dimen/text_size_title_material</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Subhead"> + <item name="android:textSize">@dimen/text_size_subhead_material</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Body2"> + <item name="android:textSize">@dimen/text_size_body_2_material</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Body1"> + <item name="android:textSize">@dimen/text_size_body_1_material</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Caption"> + <item name="android:textSize">@dimen/text_size_caption_material</item> + <item name="android:textColor">?android:textColorSecondary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Menu"> + <item name="android:textSize">@dimen/text_size_menu_material</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Button"> + <item name="android:textSize">@dimen/text_size_button_material</item> + <item name="textAllCaps">true</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <!-- Deprecated text styles --> + + <style name="Base.TextAppearance.AppCompat.Inverse"> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> + <item name="android:textColorHighlight">?android:attr/textColorHighlight</item> + <item name="android:textColorLink">?android:attr/textColorLink</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Large" parent="TextAppearance.AppCompat.Headline" /> + + <style name="Base.TextAppearance.AppCompat.Large.Inverse"> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> + <item name="android:textColorHighlight">?android:attr/textColorHighlight</item> + <item name="android:textColorLink">?android:attr/textColorLink</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Medium" parent="TextAppearance.AppCompat.Body1" /> + + <style name="Base.TextAppearance.AppCompat.Medium.Inverse"> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> + <item name="android:textColorHighlight">?android:attr/textColorHighlight</item> + <item name="android:textColorLink">?android:attr/textColorLink</item> + </style> + + <style name="Base.TextAppearance.AppCompat.Small" parent="TextAppearance.AppCompat.Caption" /> + + <style name="Base.TextAppearance.AppCompat.Small.Inverse"> + <item name="android:textColor">?android:attr/textColorSecondaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> + <item name="android:textColorHighlight">?android:attr/textColorHighlight</item> + <item name="android:textColorLink">?android:attr/textColorLink</item> + </style> + +</resources>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values/themes.xml b/current/support/v7/appcompat/res/values/themes.xml index f761155..064be3f 100644 --- a/current/support/v7/appcompat/res/values/themes.xml +++ b/current/support/v7/appcompat/res/values/themes.xml @@ -26,7 +26,7 @@ "Theme.Base" theme. --> <!-- Platform-independent theme providing an action bar in a dark-themed activity. --> - <style name="Theme.AppCompat" parent="Theme.Base.AppCompat"> + <style name="Theme.AppCompat" parent="Base.Theme.AppCompat"> <item name="isLightTheme">false</item> <!-- Required for use of support_simple_spinner_dropdown_item.xml --> @@ -38,13 +38,8 @@ <!-- Popup Menu styles --> <item name="popupMenuStyle">@style/Widget.AppCompat.PopupMenu</item> - <item name="textAppearanceLargePopupMenu"> - @style/TextAppearance.AppCompat.Widget.PopupMenu.Large - </item> - <item name="textAppearanceSmallPopupMenu"> - @style/TextAppearance.AppCompat.Widget.PopupMenu.Small - </item> - + <item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Large</item> + <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Small</item> <item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item> <item name="dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> @@ -74,10 +69,21 @@ <!-- ShareActionProvider attributes --> <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item> + <!-- Color palette --> + <item name="colorPrimaryDark">@color/material_blue_grey_900</item> + <item name="colorPrimary">@color/material_blue_grey_800</item> + <item name="colorAccent">@color/material_light_blue_A200</item> + + <item name="colorControlNormal">?android:attr/textColorSecondary</item> + <item name="colorControlActivated">?attr/colorAccent</item> + + <item name="colorControlHighlight">@color/ripple_material_dark</item> + <!-- TODO: <item name="colorButtonNormal">@color/btn_default_material_dark</item>--> + </style> <!-- Platform-independent theme providing an action bar in a light-themed activity. --> - <style name="Theme.AppCompat.Light" parent="Theme.Base.AppCompat.Light"> + <style name="Theme.AppCompat.Light" parent="Base.Theme.AppCompat.Light"> <item name="isLightTheme">true</item> <!-- Required for use of support_simple_spinner_dropdown_item.xml --> @@ -89,13 +95,8 @@ <!-- Popup Menu styles --> <item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item> - <item name="textAppearanceLargePopupMenu"> - @style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large - </item> - <item name="textAppearanceSmallPopupMenu"> - @style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small - </item> - + <item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large</item> + <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small</item> <item name="listPopupWindowStyle">@style/Widget.AppCompat.Light.ListPopupWindow</item> <item name="dropDownListViewStyle">@style/Widget.AppCompat.Light.ListView.DropDown</item> @@ -123,14 +124,23 @@ <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_holo_light</item> <!-- ShareActionProvider attributes --> - <item name="activityChooserViewStyle">@style/Widget.AppCompat.Light.ActivityChooserView - </item> + <item name="activityChooserViewStyle">@style/Widget.AppCompat.Light.ActivityChooserView</item> + + <!-- Color palette --> + <item name="colorPrimaryDark">@color/material_blue_grey_600</item> + <item name="colorPrimary">@color/material_blue_grey_400</item> + <item name="colorAccent">@color/material_light_blue_A200</item> + + <item name="colorControlNormal">?android:attr/textColorSecondary</item> + <item name="colorControlActivated">?attr/colorAccent</item> + + <item name="colorControlHighlight">@color/ripple_material_light</item> + <!-- TODO: <item name="colorButtonNormal">@color/btn_default_material_light</item>--> </style> <!-- Platform-independent theme providing an action bar in a dark-themed activity. --> - <style name="Theme.AppCompat.Light.DarkActionBar" - parent="Theme.Base.AppCompat.Light.DarkActionBar"> + <style name="Theme.AppCompat.Light.DarkActionBar" parent="Base.Theme.AppCompat.Light.DarkActionBar"> <item name="isLightTheme">true</item> <!-- Required for use of support_simple_spinner_dropdown_item.xml --> @@ -142,13 +152,8 @@ <!-- Popup Menu styles --> <item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item> - <item name="textAppearanceLargePopupMenu"> - @style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large - </item> - <item name="textAppearanceSmallPopupMenu"> - @style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small - </item> - + <item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large</item> + <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small</item> <item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item> <item name="dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item> @@ -176,25 +181,30 @@ <item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_holo_dark</item> <!-- ShareActionProvider attributes --> - <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView - </item> + <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item> + + <!-- Color palette --> + <item name="colorPrimaryDark">@color/material_blue_grey_900</item> + <item name="colorPrimary">@color/material_blue_grey_800</item> + <item name="colorAccent">@color/material_light_blue_A200</item> + + <item name="colorControlNormal">?android:attr/textColorSecondary</item> + <item name="colorControlActivated">?attr/colorAccent</item> + <item name="colorControlHighlight">@color/ripple_material_light</item> + <!-- TODO: <item name="colorButtonNormal">@color/btn_default_material_light</item>--> </style> <style name="Theme.AppCompat.DialogWhenLarge" - parent="Theme.Base.AppCompat.DialogWhenLarge"> + parent="Base.Theme.AppCompat.DialogWhenLarge"> </style> <style name="Theme.AppCompat.Light.DialogWhenLarge" - parent="Theme.Base.AppCompat.Light.DialogWhenLarge"> + parent="Base.Theme.AppCompat.Light.DialogWhenLarge"> </style> <!-- Menu/item attributes --> - <style name="Theme.AppCompat.CompactMenu" parent="Theme.AppCompat.Base.CompactMenu"> - </style> - - <style name="Theme.AppCompat.CompactMenu.Dialog" - parent="Theme.AppCompat.Base.CompactMenu.Dialog"> + <style name="Theme.AppCompat.CompactMenu" parent="Base.Theme.AppCompat.CompactMenu"> </style> </resources> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index f707c3a..707df2f 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -41,49 +41,48 @@ directly by apps. --> <eat-comment/> - <style name="Theme.Base" parent="Theme.Platform.AppCompat"> + <style name="Base.Theme" parent="Theme.Platform.AppCompat"> </style> - <style name="Theme.Base.Light" parent="Theme.Platform.AppCompat.Light"> + <style name="Base.Theme.Light" parent="Theme.Platform.AppCompat.Light"> </style> <!-- Base platform-dependent theme providing an action bar in a dark-themed activity. --> - <style name="Theme.Base.AppCompat" parent="Theme.Base"> - <item name="windowActionBar">true</item> + <style name="Base.Theme.AppCompat" parent="Base.Theme"> + <item name="android:colorForeground">@color/bright_foreground_material_dark</item> + <item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item> + <item name="android:colorBackground">@color/background_material_dark</item> + <item name="android:colorBackgroundCacheHint">@color/abc_background_cache_hint_selector_material_dark</item> + <item name="android:disabledAlpha">0.5</item> + <item name="android:backgroundDimAmount">0.6</item> + <!-- Remove system title bars; we will add the action bar ourselves. --> <item name="android:windowNoTitle">true</item> + <item name="android:windowBackground">@color/background_material_dark</item> + + <item name="windowActionBar">true</item> <item name="buttonBarStyle">@android:style/ButtonBar</item> <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> - <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_holo_dark</item> + <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> <item name="dividerVertical">@drawable/abc_list_divider_holo_dark</item> <item name="dividerHorizontal">@drawable/abc_list_divider_holo_dark</item> - <item name="listPreferredItemHeight">?android:attr/listPreferredItemHeight</item> - <item name="listPreferredItemHeightSmall">48dp</item> - <item name="listPreferredItemHeightLarge">80dp</item> - <item name="listPreferredItemPaddingLeft">8dip</item> - <item name="listPreferredItemPaddingRight">8dip</item> - - <item name="textAppearanceListItem">?android:attr/textAppearanceLarge</item> - <item name="textAppearanceListItemSmall">?android:attr/textAppearanceLarge</item> - + <!-- Action Bar Styles --> <item name="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item> <item name="actionBarTabBarStyle">@style/Widget.AppCompat.ActionBar.TabBar</item> <item name="actionBarTabTextStyle">@style/Widget.AppCompat.ActionBar.TabText</item> <item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item> <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item> - <item name="actionBarStyle">@style/Widget.AppCompat.ActionBar</item> + <item name="actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item> <item name="actionBarSplitStyle">?attr/actionBarStyle</item> <item name="actionBarWidgetTheme">@null</item> - <item name="actionBarSize">@dimen/abc_action_bar_default_height</item> + <item name="actionBarSize">@dimen/abc_action_bar_default_height_material</item> <item name="actionBarDivider">?attr/dividerVertical</item> <item name="actionBarItemBackground">?attr/selectableItemBackground</item> - <item name="actionMenuTextAppearance"> - @style/TextAppearance.AppCompat.Widget.ActionBar.Menu - </item> + <item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item> <item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item> <!-- Dropdown Spinner Attributes --> @@ -91,74 +90,101 @@ <!-- Action Mode --> <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> - <item name="actionModeBackground">@drawable/abc_cab_background_top_holo_dark</item> - <item name="actionModeSplitBackground">@drawable/abc_cab_background_bottom_holo_dark</item> + <item name="actionModeBackground">?attr/colorPrimaryDark</item> + <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_dark</item> - <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode - </item> + <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item> + <item name="android:panelBackground">?android:attr/colorBackground</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> + <!-- Text styles --> + <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> + <item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item> + + <item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item> + <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item> + <item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_dark</item> + <item name="android:textColorSecondary">@color/secondary_text_material_dark</item> + <item name="android:textColorSecondaryInverse">@color/secondary_text_material_light</item> + <item name="android:textColorTertiary">@color/tertiary_text_material_dark</item> + <item name="android:textColorTertiaryInverse">@color/tertiary_text_material_light</item> + <item name="android:textColorHint">@color/hint_foreground_material_dark</item> + <item name="android:textColorHintInverse">@color/hint_foreground_material_light</item> + <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> + <item name="android:textColorLink">@color/material_teal_500</item> + + <item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item> + <item name="android:textAppearanceLargeInverse">@style/TextAppearance.AppCompat.Large.Inverse</item> + <item name="android:textAppearanceMedium">@style/TextAppearance.AppCompat.Medium</item> + <item name="android:textAppearanceMediumInverse">@style/TextAppearance.AppCompat.Medium.Inverse</item> + <item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item> + <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> + + <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item> + + <item name="listPreferredItemHeight">64dp</item> + <item name="listPreferredItemHeightSmall">48dp</item> + <item name="listPreferredItemHeightLarge">80dp</item> + <item name="listPreferredItemPaddingLeft">16dip</item> + <item name="listPreferredItemPaddingRight">16dip</item> + </style> <!-- Base platform-dependent theme providing an action bar in a light-themed activity. --> - <style name="Theme.Base.AppCompat.Light" parent="Theme.Base.Light"> - <item name="windowActionBar">true</item> + <style name="Base.Theme.AppCompat.Light" parent="Base.Theme.Light"> + <item name="android:colorForeground">@color/bright_foreground_material_light</item> + <item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item> + <item name="android:colorBackground">@color/background_material_light</item> + <item name="android:colorBackgroundCacheHint">@color/abc_background_cache_hint_selector_material_light</item> + <item name="android:disabledAlpha">0.5</item> + <item name="android:backgroundDimAmount">0.6</item> + <!-- Remove system title bars; we will add the action bar ourselves. --> <item name="android:windowNoTitle">true</item> + <item name="android:windowBackground">@color/background_material_light</item> + + <item name="windowActionBar">true</item> <item name="buttonBarStyle">@android:style/ButtonBar</item> <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> - <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_holo_light</item> + <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item> <item name="dividerVertical">@drawable/abc_list_divider_holo_light</item> <item name="dividerHorizontal">@drawable/abc_list_divider_holo_light</item> - <item name="listPreferredItemHeight">?android:attr/listPreferredItemHeight</item> - <item name="listPreferredItemHeightSmall">48dp</item> - <item name="listPreferredItemHeightLarge">80dp</item> - <item name="listPreferredItemPaddingLeft">8dip</item> - <item name="listPreferredItemPaddingRight">8dip</item> - - <item name="textAppearanceListItem">?android:attr/textAppearanceLarge</item> - <item name="textAppearanceListItemSmall">?android:attr/textAppearanceLarge</item> - <!-- Action Bar Styles --> <item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item> <item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar</item> <item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText</item> <item name="actionButtonStyle">@style/Widget.AppCompat.Light.ActionButton</item> - <item name="actionOverflowButtonStyle"> - @style/Widget.AppCompat.Light.ActionButton.Overflow - </item> - <item name="actionBarStyle">@style/Widget.AppCompat.Light.ActionBar</item> + <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.Light.ActionButton.Overflow</item> + <item name="actionBarStyle">@style/Widget.AppCompat.Light.ActionBar.Solid</item> <item name="actionBarSplitStyle">?attr/actionBarStyle</item> <item name="actionBarWidgetTheme">@null</item> - <item name="actionBarSize">@dimen/abc_action_bar_default_height</item> + <item name="actionBarSize">@dimen/abc_action_bar_default_height_material</item> <item name="actionBarDivider">?attr/dividerVertical</item> <item name="actionBarItemBackground">?attr/selectableItemBackground</item> - <item name="actionMenuTextAppearance"> - @style/TextAppearance.AppCompat.Widget.ActionBar.Menu - </item> + <item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item> <item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item> <!-- Action Mode --> <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> - <item name="actionModeBackground">@drawable/abc_cab_background_top_holo_light</item> - <item name="actionModeSplitBackground">@drawable/abc_cab_background_bottom_holo_light</item> + <item name="actionModeBackground">?attr/colorPrimaryDark</item> + <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_light</item> - <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode - </item> + <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item> <!-- Dropdown Spinner Attributes --> - <item name="actionDropDownStyle"> - @style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar - </item> + <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> + + <item name="listPopupWindowStyle">@style/Widget.AppCompat.Light.ListPopupWindow</item> + <item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item> <!-- Panel attributes --> <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> @@ -166,32 +192,59 @@ <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_light</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item> + <!-- Text styles --> + <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> + <item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item> + + <item name="android:textColorPrimary">@color/abc_primary_text_material_light</item> + <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_dark</item> + <item name="android:textColorSecondary">@color/secondary_text_material_light</item> + <item name="android:textColorSecondaryInverse">@color/secondary_text_material_dark</item> + <item name="android:textColorTertiary">@color/tertiary_text_material_light</item> + <item name="android:textColorTertiaryInverse">@color/tertiary_text_material_dark</item> + <item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_light</item> + <item name="android:textColorPrimaryInverseDisableOnly">@color/abc_primary_text_disable_only_material_dark</item> + <item name="android:textColorHint">@color/hint_foreground_material_light</item> + <item name="android:textColorHintInverse">@color/hint_foreground_material_dark</item> + <item name="android:textColorHighlight">@color/highlighted_text_material_light</item> + <item name="android:textColorLink">@color/material_teal_500</item> + + <item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item> + <item name="android:textAppearanceLargeInverse">@style/TextAppearance.AppCompat.Large.Inverse</item> + <item name="android:textAppearanceMedium">@style/TextAppearance.AppCompat.Medium</item> + <item name="android:textAppearanceMediumInverse">@style/TextAppearance.AppCompat.Medium.Inverse</item> + <item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item> + <item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item> + + <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item> + + <item name="listPreferredItemHeight">64dp</item> + <item name="listPreferredItemHeightSmall">48dp</item> + <item name="listPreferredItemHeightLarge">80dp</item> + <item name="listPreferredItemPaddingLeft">16dip</item> + <item name="listPreferredItemPaddingRight">16dip</item> + </style> <!-- Base platform-dependent theme providing a dark action bar in a light-themed activity. --> - <style name="Theme.Base.AppCompat.Light.DarkActionBar" parent="Theme.Base.AppCompat.Light"> - <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_holo_dark</item> + <style name="Base.Theme.AppCompat.Light.DarkActionBar" parent="Base.Theme.AppCompat.Light"> + <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> <item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item> <item name="actionBarStyle">@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse</item> <item name="actionBarWidgetTheme">@style/Theme.AppCompat</item> <item name="actionBarDivider">@drawable/abc_list_divider_holo_dark</item> <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> - <item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView.Inverse - </item> - <item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse - </item> - <item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText.Inverse - </item> + <item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView.Inverse</item> + <item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse</item> + <item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText.Inverse</item> <item name="actionMenuTextColor">?android:attr/textColorPrimaryInverseDisableOnly</item> <!-- Action Mode --> <item name="actionModeStyle">@style/Widget.AppCompat.Light.ActionMode.Inverse</item> - <item name="actionModeBackground">@drawable/abc_cab_background_top_holo_dark</item> - <item name="actionModeSplitBackground">@drawable/abc_cab_background_bottom_holo_dark</item> <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_dark</item> - <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode - </item> + <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode</item> <!-- Dropdown Spinner Attributes --> <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> @@ -203,27 +256,18 @@ </style> <!-- Menu/item attributes --> - <style name="Theme.AppCompat.Base.CompactMenu" parent=""> - <item name="android:itemTextAppearance"> - @style/TextAppearance.Widget.AppCompat.ExpandedMenu.Item</item> + <style name="Base.Theme.AppCompat.CompactMenu" parent=""> + <item name="android:itemTextAppearance">?android:attr/textAppearanceMedium</item> <item name="android:listViewStyle">@style/Widget.AppCompat.ListView.Menu</item> </style> - <style name="Theme.AppCompat.Base.CompactMenu.Dialog" parent=""> - <item name="android:itemTextAppearance"> - @style/TextAppearance.AppCompat.Base.CompactMenu.Dialog</item> - <item name="android:listViewStyle">@android:style/Widget.ListView.Menu</item> - </style> - - <style name="Theme.Base.AppCompat.DialogWhenLarge" - parent="Theme.Base.AppCompat"> + <style name="Base.Theme.AppCompat.DialogWhenLarge" parent="Base.Theme.AppCompat"> </style> - <style name="Theme.Base.AppCompat.Light.DialogWhenLarge" - parent="Theme.Base.AppCompat.Light"> + <style name="Base.Theme.AppCompat.Light.DialogWhenLarge" parent="Base.Theme.AppCompat.Light"> </style> - <style name="Theme.Base.AppCompat.Dialog.FixedSize" parent="Theme.Platform.AppCompat.Dialog"> + <style name="Base.Theme.AppCompat.Dialog.FixedSize" parent="Theme.Platform.AppCompat.Dialog"> <item name="windowFixedWidthMajor">@dimen/dialog_fixed_width_major</item> <item name="windowFixedWidthMinor">@dimen/dialog_fixed_width_minor</item> <item name="windowFixedHeightMajor">@dimen/dialog_fixed_height_major</item> @@ -233,38 +277,11 @@ <!-- Remove system title bars; we will add the action bar ourselves. --> <item name="android:windowNoTitle">true</item> - <item name="buttonBarStyle">@android:style/ButtonBar</item> - <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> - <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> - - <item name="dividerVertical">@drawable/abc_list_divider_holo_dark</item> - <item name="dividerHorizontal">@drawable/abc_list_divider_holo_dark</item> + <!-- TODO: Need fixing once Base.Theme.AppCompat themes are done --> - <item name="listPreferredItemHeight">?android:attr/listPreferredItemHeight</item> - <item name="listPreferredItemHeightSmall">48dp</item> - <item name="listPreferredItemHeightLarge">80dp</item> - <item name="listPreferredItemPaddingLeft">8dip</item> - <item name="listPreferredItemPaddingRight">8dip</item> - - <item name="textAppearanceListItem">?android:attr/textAppearanceMedium</item> - <item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item> - - <!-- Action Mode --> - <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> - <item name="actionModeBackground">@drawable/abc_cab_background_top_holo_dark</item> - <item name="actionModeSplitBackground">@drawable/abc_cab_background_bottom_holo_dark</item> - <item name="actionModeCloseDrawable">@drawable/abc_ic_cab_done_holo_dark</item> - <item name="actionModeCloseButtonStyle">@style/Widget.AppCompat.ActionButton.CloseMode - </item> - - <!-- Panel attributes --> - <item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item> - <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> - <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item> - <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> </style> - <style name="Theme.Base.AppCompat.Dialog.Light.FixedSize" - parent="Theme.Base.AppCompat.Dialog.FixedSize" /> + <style name="Base.Theme.AppCompat.Dialog.Light.FixedSize" + parent="Base.Theme.AppCompat.Dialog.FixedSize" /> </resources> |