diff options
Diffstat (limited to 'current/support/v7')
18 files changed, 212 insertions, 182 deletions
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex f343002..b45dce0 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/color/abc_primary_text_material_dark.xml b/current/support/v7/appcompat/res/color/abc_primary_text_material_dark.xml index 7d66d02..003a965 100644 --- a/current/support/v7/appcompat/res/color/abc_primary_text_material_dark.xml +++ b/current/support/v7/appcompat/res/color/abc_primary_text_material_dark.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_dark"/> + <item android:state_enabled="false" android:color="@color/primary_text_disabled_default_material_dark"/> <item android:color="@color/primary_text_default_material_dark"/> </selector> diff --git a/current/support/v7/appcompat/res/color/abc_primary_text_material_light.xml b/current/support/v7/appcompat/res/color/abc_primary_text_material_light.xml index 105b643..17ad48a 100644 --- a/current/support/v7/appcompat/res/color/abc_primary_text_material_light.xml +++ b/current/support/v7/appcompat/res/color/abc_primary_text_material_light.xml @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_light"/> + <item android:state_enabled="false" android:color="@color/primary_text_disabled_default_material_light"/> <item android:color="@color/primary_text_default_material_light"/> </selector> diff --git a/current/support/v7/appcompat/res/values-land/dimens.xml b/current/support/v7/appcompat/res/values-land/dimens.xml index a78dd94..c82e8db 100644 --- a/current/support/v7/appcompat/res/values-land/dimens.xml +++ b/current/support/v7/appcompat/res/values-land/dimens.xml @@ -28,4 +28,8 @@ <!-- Size of the indeterminate Progress Bar --> <dimen name="abc_action_bar_progress_bar_size">32dp</dimen> + <dimen name="abc_action_bar_default_height_material">48dp</dimen> + <dimen name="abc_text_size_title_material_toolbar">14dp</dimen> + <dimen name="abc_text_size_subtitle_material_toolbar">12dp</dimen> + </resources>
\ No newline at end of file diff --git a/current/support/v7/appcompat/res/values-v11/themes_base.xml b/current/support/v7/appcompat/res/values-v11/themes_base.xml index 06c295f..019003e 100644 --- a/current/support/v7/appcompat/res/values-v11/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml @@ -43,17 +43,14 @@ <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/abc_secondary_text_material_dark</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</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:textColorHighlightInverse">@color/highlighted_text_material_light</item> - <item name="android:textColorLink">@color/link_text_material_dark</item> - <item name="android:textColorLinkInverse">@color/link_text_material_light</item> - <item name="android:textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -86,19 +83,16 @@ <!-- Text colors --> <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/abc_secondary_text_material_light</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_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:textColorHighlightInverse">@color/highlighted_text_material_dark</item> - <item name="android:textColorLink">@color/link_text_material_light</item> - <item name="android:textColorLinkInverse">@color/link_text_material_dark</item> - <item name="android:textColorAlertDialogListItem">@color/abc_primary_text_material_light</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -132,17 +126,14 @@ <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/abc_secondary_text_material_dark</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</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:textColorHighlightInverse">@color/highlighted_text_material_light</item> - <item name="android:textColorLink">@color/link_text_material_dark</item> - <item name="android:textColorLinkInverse">@color/link_text_material_light</item> - <item name="android:textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -175,19 +166,16 @@ <!-- Text colors --> <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/abc_secondary_text_material_light</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_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:textColorHighlightInverse">@color/highlighted_text_material_dark</item> - <item name="android:textColorLink">@color/link_text_material_light</item> - <item name="android:textColorLinkInverse">@color/link_text_material_dark</item> - <item name="android:textColorAlertDialogListItem">@color/abc_primary_text_material_light</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -289,9 +277,9 @@ <item name="editTextColor">?android:attr/textColorPrimary</item> <!-- Color palette --> - <item name="colorPrimaryDark">@color/material_blue_grey_100</item> - <item name="colorPrimary">@color/material_blue_grey_50</item> - <item name="colorAccent">@color/material_deep_teal_500</item> + <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> diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml index 44a0d2d..b3b1fa7 100644 --- a/current/support/v7/appcompat/res/values/attrs.xml +++ b/current/support/v7/appcompat/res/values/attrs.xml @@ -627,7 +627,6 @@ <attr name="queryBackground" format="reference" /> <!-- Background for the section containing the action (e.g. voice search) --> <attr name="submitBackground" format="reference" /> - <attr name="android:focusable" /> </declare-styleable> <!-- Attrbitutes for a ActivityChooserView. --> @@ -745,25 +744,4 @@ <attr name="android:dropDownHorizontalOffset" /> </declare-styleable> - <declare-styleable name="DrawerArrowToggle"> - <!-- The drawing color for the bars --> - <attr name="color" format="color"/> - <!-- Whether bars should rotate or not during transition --> - <attr name="spinBars" format="boolean"/> - <!-- The total size of the drawable --> - <attr name="drawableSize" format="dimension"/> - <!-- The max gap between the bars when they are parallel to each other --> - <attr name="gapBetweenBars" format="dimension"/> - <!-- The size of the top and bottom bars when they merge to the middle bar to form an arrow --> - <attr name="topBottomBarArrowSize" format="dimension"/> - <!-- The size of the middle bar when top and bottom bars merge into middle bar to form an arrow --> - <attr name="middleBarArrowSize" format="dimension"/> - <!-- The size of the bars when they are parallel to each other --> - <attr name="barSize" format="dimension"/> - <!-- The thickness (stroke size) for the bar paint --> - <attr name="thickness" format="dimension"/> - </declare-styleable> - - <attr name="drawerArrowStyle" format="reference" /> - </resources> diff --git a/current/support/v7/appcompat/res/values/colors_material.xml b/current/support/v7/appcompat/res/values/colors_material.xml index 8bed195..110093d 100644 --- a/current/support/v7/appcompat/res/values/colors_material.xml +++ b/current/support/v7/appcompat/res/values/colors_material.xml @@ -15,7 +15,7 @@ limitations under the License. --> -<!-- Colors specific to Material themes. --> +<!-- Colors specific to Quantum themes. --> <resources> <color name="background_material_dark">#ff212121</color> <color name="background_material_light">#fffafafa</color> @@ -42,45 +42,123 @@ <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">#6680cbc4</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">#66009688</color> - - <color name="link_text_material_dark">@color/material_deep_teal_200</color> - <color name="link_text_material_light">@color/material_deep_teal_500</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> - <color name="secondary_text_default_material_light">#8a000000</color> - - <color name="primary_text_default_material_dark">#ffffffff</color> - <color name="secondary_text_default_material_dark">#b3ffffff</color> - - <item name="disabled_alpha_material_light" format="float" type="dimen">0.26</item> - <item name="disabled_alpha_material_dark" format="float" type="dimen">0.30</item> - - <!-- 26% of default values --> - <color name="primary_text_disabled_material_light">#39000000</color> - <color name="secondary_text_disabled_material_light">#24000000</color> - - <!-- 30% of default values --> - <color name="primary_text_disabled_material_dark">#4Dffffff</color> - <color name="secondary_text_disabled_material_dark">#36ffffff</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_deep_teal_200">#ff80cbc4</color> - <color name="material_deep_teal_500">#ff009688</color> + <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> + + <color name="material_deep_teal_A200">#ff80cbc4</color> + <color name="material_deep_teal_A500">#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/dimens_material.xml b/current/support/v7/appcompat/res/values/dimens_material.xml index 1d510e7..f147e65 100644 --- a/current/support/v7/appcompat/res/values/dimens_material.xml +++ b/current/support/v7/appcompat/res/values/dimens_material.xml @@ -16,37 +16,29 @@ --> <resources> - <!-- Default height of an action bar. --> <dimen name="abc_action_bar_default_height_material">56dp</dimen> - <!-- Default padding of an action bar. --> - <dimen name="abc_action_bar_default_padding_material">4dp</dimen> - <!-- Vertical padding around action bar icons. --> - <dimen name="abc_action_bar_icon_vertical_padding_material">16dp</dimen> - <!-- Top margin for action bar subtitles --> - <dimen name="abc_action_bar_subtitle_top_margin_material">-3dp</dimen> - <!-- Bottom margin for action bar subtitles --> - <dimen name="abc_action_bar_subtitle_bottom_margin_material">5dp</dimen> + <dimen name="abc_text_size_title_material_toolbar">20dp</dimen> + <dimen name="abc_text_size_subtitle_material_toolbar">16dp</dimen> <dimen name="abc_action_button_min_width_material">48dp</dimen> <dimen name="abc_action_button_min_height_material">48dp</dimen> - - <dimen name="abc_text_size_display_4_material">112sp</dimen> - <dimen name="abc_text_size_display_3_material">56sp</dimen> - <dimen name="abc_text_size_display_2_material">45sp</dimen> - <dimen name="abc_text_size_display_1_material">34sp</dimen> - <dimen name="abc_text_size_headline_material">24sp</dimen> - <dimen name="abc_text_size_title_material">20sp</dimen> - <dimen name="abc_text_size_subhead_material">16sp</dimen> - <dimen name="abc_text_size_title_material_toolbar">20dp</dimen> - <dimen name="abc_text_size_subtitle_material_toolbar">16dp</dimen> - <dimen name="abc_text_size_menu_material">16sp</dimen> - <dimen name="abc_text_size_body_2_material">14sp</dimen> - <dimen name="abc_text_size_body_1_material">14sp</dimen> - <dimen name="abc_text_size_caption_material">12sp</dimen> - <dimen name="abc_text_size_button_material">14sp</dimen> - - <dimen name="abc_text_size_large_material">22sp</dimen> - <dimen name="abc_text_size_medium_material">18sp</dimen> - <dimen name="abc_text_size_small_material">14sp</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_menu_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_button_material">14sp</dimen> + + <dimen name="text_size_large_material">22sp</dimen> + <dimen name="text_size_medium_material">18sp</dimen> + <dimen name="text_size_small_material">14sp</dimen> </resources> diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml index c85439a..8b84d53 100644 --- a/current/support/v7/appcompat/res/values/styles.xml +++ b/current/support/v7/appcompat/res/values/styles.xml @@ -99,11 +99,6 @@ parent="Base.Widget.AppCompat.ActionBar.TabText"> </style> - <style name="Widget.AppCompat.DrawerArrowToggle" - parent="Base.Widget.AppCompat.DrawerArrowToggle"> - <item name="color">?attr/colorControlNormal</item> - </style> - <style name="Widget.AppCompat.Light.ActionBar.TabText" parent="Base.Widget.AppCompat.Light.ActionBar.TabText"> </style> diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml index d4d5247..1e83fb8 100644 --- a/current/support/v7/appcompat/res/values/styles_base.xml +++ b/current/support/v7/appcompat/res/values/styles_base.xml @@ -63,8 +63,8 @@ <style name="Base.Widget.AppCompat.ActionButton" parent=""> <item name="android:background">?attr/actionBarItemBackground</item> - <item name="android:paddingLeft">0dip</item> - <item name="android:paddingRight">0dip</item> + <item name="android:paddingLeft">12dip</item> + <item name="android:paddingRight">12dip</item> <item name="android:minWidth">@dimen/abc_action_button_min_width_material</item> <item name="android:minHeight">@dimen/abc_action_button_min_height_material</item> <item name="android:scaleType">center</item> @@ -82,12 +82,20 @@ <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:background">?attr/actionBarItemBackground</item> <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item> - <item name="android:paddingRight">12dip</item> + <item name="android:minWidth">@dimen/abc_action_overflow_min_width_material</item> + <item name="android:minHeight">@dimen/abc_action_button_min_height_material</item> + <item name="android:scaleType">center</item> </style> - <style name="Base.Widget.AppCompat.Light.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow"> + <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:background">?attr/actionBarItemBackground</item> + <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item> + <item name="android:minWidth">@dimen/abc_action_overflow_min_width_material</item> + <item name="android:minHeight">@dimen/abc_action_button_min_height_material</item> + <item name="android:scaleType">center</item> </style> <style name="Base.Widget.AppCompat.ActionBar.TabBar" parent=""> @@ -378,15 +386,4 @@ <item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item> </style> - <style name="Base.Widget.AppCompat.DrawerArrowToggle" parent=""> - <item name="color">?android:attr/textColorPrimary</item> - <item name="thickness">2dp</item> - <item name="barSize">18dp</item> - <item name="gapBetweenBars">3dp</item> - <item name="topBottomBarArrowSize">11.31dp</item> - <item name="middleBarArrowSize">16dp</item> - <item name="drawableSize">24dp</item> - <item name="spinBars">true</item> - </style> - </resources> diff --git a/current/support/v7/appcompat/res/values/styles_base_text.xml b/current/support/v7/appcompat/res/values/styles_base_text.xml index 92a02bb..0eb0268 100644 --- a/current/support/v7/appcompat/res/values/styles_base_text.xml +++ b/current/support/v7/appcompat/res/values/styles_base_text.xml @@ -22,36 +22,36 @@ <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/abc_text_size_body_1_material</item> + <item name="android:textSize">@dimen/text_size_body_1_material</item> </style> <style name="Base.TextAppearance.AppCompat.Display4"> - <item name="android:textSize">@dimen/abc_text_size_display_4_material</item> + <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/abc_text_size_display_3_material</item> + <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/abc_text_size_display_2_material</item> + <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/abc_text_size_display_1_material</item> + <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/abc_text_size_headline_material</item> + <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/abc_text_size_title_material</item> + <item name="android:textSize">@dimen/text_size_title_material</item> <item name="android:textColor">?android:textColorPrimary</item> </style> @@ -63,7 +63,7 @@ </style> <style name="Base.TextAppearance.AppCompat.Subhead"> - <item name="android:textSize">@dimen/abc_text_size_subhead_material</item> + <item name="android:textSize">@dimen/text_size_subhead_material</item> <item name="android:textColor">?android:textColorPrimary</item> </style> @@ -75,27 +75,27 @@ </style> <style name="Base.TextAppearance.AppCompat.Body2"> - <item name="android:textSize">@dimen/abc_text_size_body_2_material</item> + <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/abc_text_size_body_1_material</item> + <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/abc_text_size_caption_material</item> + <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/abc_text_size_menu_material</item> + <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/abc_text_size_button_material</item> + <item name="android:textSize">@dimen/text_size_button_material</item> <item name="textAllCaps">true</item> <item name="android:textColor">?android:textColorPrimary</item> </style> @@ -108,7 +108,7 @@ </style> <style name="Base.TextAppearance.AppCompat.Large"> - <item name="android:textSize">@dimen/abc_text_size_large_material</item> + <item name="android:textSize">@dimen/text_size_large_material</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> @@ -118,7 +118,7 @@ </style> <style name="Base.TextAppearance.AppCompat.Medium"> - <item name="android:textSize">@dimen/abc_text_size_medium_material</item> + <item name="android:textSize">@dimen/text_size_medium_material</item> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> @@ -128,7 +128,7 @@ </style> <style name="Base.TextAppearance.AppCompat.Small"> - <item name="android:textSize">@dimen/abc_text_size_small_material</item> + <item name="android:textSize">@dimen/text_size_small_material</item> <item name="android:textColor">?android:attr/textColorTertiary</item> </style> diff --git a/current/support/v7/appcompat/res/values/themes.xml b/current/support/v7/appcompat/res/values/themes.xml index 656c0d7..a0848b7 100644 --- a/current/support/v7/appcompat/res/values/themes.xml +++ b/current/support/v7/appcompat/res/values/themes.xml @@ -28,13 +28,11 @@ <!-- Platform-independent theme providing an action bar in a dark-themed activity. --> <style name="Theme.AppCompat" parent="Base.Theme.AppCompat"> - <item name="drawerArrowStyle">@style/Widget.AppCompat.DrawerArrowToggle</item> </style> <!-- Platform-independent theme providing an action bar in a light-themed activity. --> <style name="Theme.AppCompat.Light" parent="Base.Theme.AppCompat.Light"> - <item name="drawerArrowStyle">@style/Widget.AppCompat.DrawerArrowToggle</item> </style> <!-- Platform-independent theme providing an action bar in a dark-themed activity. --> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index 90e1842..22ef868 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -41,14 +41,14 @@ <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/abc_secondary_text_material_dark</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</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>m> - <item name="android:textColorLink">@color/link_text_material_dark</item> + <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -79,16 +79,16 @@ <!-- Text colors --> <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/abc_secondary_text_material_light</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_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/link_text_material_light</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -120,14 +120,14 @@ <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/abc_secondary_text_material_dark</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</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>m> - <item name="android:textColorLink">@color/link_text_material_dark</item> + <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> + <item name="android:textColorLink">@color/material_teal_500</item> <!-- Text styles --> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item> @@ -241,7 +241,7 @@ <!-- 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_deep_teal_200</item> + <item name="colorAccent">@color/material_light_blue_A200</item> <item name="colorControlNormal">?android:attr/textColorSecondary</item> <item name="colorControlActivated">?attr/colorAccent</item> @@ -339,9 +339,9 @@ <item name="editTextColor">?android:attr/textColorPrimary</item> <!-- Color palette --> - <item name="colorPrimaryDark">@color/material_blue_grey_100</item> - <item name="colorPrimary">@color/material_blue_grey_50</item> - <item name="colorAccent">@color/material_deep_teal_500</item> + <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> @@ -462,7 +462,7 @@ <!-- 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_deep_teal_200</item> + <item name="colorAccent">@color/material_light_blue_A200</item> <item name="colorControlNormal">?android:attr/textColorSecondary</item> <item name="colorControlActivated">?attr/colorAccent</item> @@ -506,16 +506,16 @@ <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/abc_secondary_text_material_light</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_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/link_text_material_light</item> + <item name="android:textColorLink">@color/material_teal_500</item> <item name="android:listDivider">@drawable/abc_list_divider_material_light</item> @@ -556,14 +556,14 @@ <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/abc_secondary_text_material_dark</item> - <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item> - <item name="android:textColorTertiary">@color/abc_secondary_text_material_dark</item> - <item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</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>m> - <item name="android:textColorLink">@color/link_text_material_dark</item> + <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> + <item name="android:textColorLink">@color/material_teal_500</item> <item name="android:listDivider">@drawable/abc_list_divider_material_dark</item> 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 7624751..efdf358 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 2063453..b2d3862 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 654400b..6a8b09f 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 f6a989f..3e6e32b 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 cfbf25b..5bb9898 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar |