Skip to content
This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

Permalink
Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with…
Browse files Browse the repository at this point in the history 
… Material attrs"

This partially reverts commit 045abe7.

Basically we're just removing the attributes that were explicitly
defined as null, since apparently they don't have fallback values
unless Holo is overlaid atop Material (blergh).

Bug: b/79725570
Test: manual against from bug APK
Change-Id: I7a5fe3f96a9720e0657042ce8d5a87b2fb590327
  • Loading branch information
@alanv
alanv committed May 31, 2018
1 parent e3348a2 commit 2fc8afa
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 39 deletions.
4 changes: 0 additions & 4 deletions core/res/res/values/themes.xml
View file
Expand Up @@ -106,7 +106,6 @@ please see themes_device_defaults.xml.

<item name="textAppearanceLargePopupMenu">@style/TextAppearance.Widget.PopupMenu.Large</item>
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Widget.PopupMenu.Small</item>
<item name="textAppearancePopupMenuHeader">@null</item>

<!-- Button styles -->
<item name="buttonStyle">@style/Widget.Button</item>
Expand Down Expand Up @@ -230,7 +229,6 @@ please see themes_device_defaults.xml.

<item name="panelMenuIsCompact">false</item>
<item name="panelMenuListWidth">296dip</item>
<item name="panelMenuListTheme">@null</item>

<!-- Scrollbar attributes -->
<item name="scrollbarFadeDuration">250</item>
Expand Down Expand Up @@ -308,8 +306,6 @@ please see themes_device_defaults.xml.
<item name="quickContactBadgeStyleSmallWindowLarge">@style/Widget.QuickContactBadgeSmall.WindowLarge</item>
<item name="listPopupWindowStyle">@style/Widget.ListPopupWindow</item>
<item name="popupMenuStyle">@style/Widget.PopupMenu</item>
<item name="popupTheme">@null</item>
<item name="stackViewStyle">@null</item>
<item name="activityChooserViewStyle">@style/Widget.ActivityChooserView</item>
<item name="fragmentBreadCrumbsStyle">@style/Widget.FragmentBreadCrumbs</item>
<item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>
Expand Down
35 changes: 0 additions & 35 deletions core/res/res/values/themes_holo.xml
View file
Expand Up @@ -112,7 +112,6 @@ please see themes_device_defaults.xml.

<item name="textAppearanceLargePopupMenu">@style/TextAppearance.Holo.Widget.PopupMenu.Large</item>
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Holo.Widget.PopupMenu.Small</item>
<item name="textAppearancePopupMenuHeader">@null</item>

<item name="textEditSuggestionItemLayout">@layout/text_edit_suggestion_item</item>
<item name="textEditSuggestionContainerLayout">@layout/text_edit_suggestion_container</item>
Expand Down Expand Up @@ -257,7 +256,6 @@ please see themes_device_defaults.xml.
<item name="gridViewStyle">@style/Widget.Holo.GridView</item>
<item name="imageButtonStyle">@style/Widget.Holo.ImageButton</item>
<item name="imageWellStyle">@style/Widget.Holo.ImageWell</item>
<item name="listMenuViewStyle">@null</item>
<item name="listViewStyle">@style/Widget.Holo.ListView</item>
<item name="listViewWhiteStyle">@style/Widget.Holo.ListView.White</item>
<item name="popupWindowStyle">@style/Widget.Holo.PopupWindow</item>
Expand Down Expand Up @@ -298,7 +296,6 @@ please see themes_device_defaults.xml.
<item name="quickContactBadgeStyleSmallWindowLarge">@style/Widget.Holo.QuickContactBadgeSmall.WindowLarge</item>
<item name="listPopupWindowStyle">@style/Widget.Holo.ListPopupWindow</item>
<item name="popupMenuStyle">@style/Widget.Holo.PopupMenu</item>
<item name="popupTheme">@null</item>
<item name="stackViewStyle">@style/Widget.Holo.StackView</item>
<item name="activityChooserViewStyle">@style/Widget.Holo.ActivityChooserView</item>
<item name="fragmentBreadCrumbsStyle">@style/Widget.Holo.FragmentBreadCrumbs</item>
Expand All @@ -319,11 +316,6 @@ please see themes_device_defaults.xml.
<item name="editTextPreferenceStyle">@style/Preference.Holo.DialogPreference.EditTextPreference</item>
<item name="ringtonePreferenceStyle">@style/Preference.Holo.RingtonePreference</item>
<item name="preferenceLayoutChild">@layout/preference_child_holo</item>
<item name="preferencePanelStyle">@null</item>
<item name="preferenceHeaderPanelStyle">@null</item>
<item name="preferenceListStyle">@null</item>
<item name="preferenceFragmentListStyle">@null</item>
<item name="preferenceFragmentPaddingSide">@null</item>
<item name="detailsElementBackground">@drawable/panel_bg_holo_dark</item>

<!-- PreferenceFrameLayout attributes -->
Expand All @@ -348,13 +340,10 @@ please see themes_device_defaults.xml.
<item name="actionBarStyle">@style/Widget.Holo.ActionBar</item>
<item name="actionBarSize">@dimen/action_bar_default_height</item>
<item name="actionModePopupWindowStyle">@style/Widget.Holo.PopupWindow.ActionMode</item>
<item name="actionMenuTextAppearance">@null</item>
<item name="actionMenuTextColor">@null</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarPopupTheme">?attr/popupTheme</item>
<item name="actionBarTheme">@null</item>
<item name="actionBarDivider">?attr/dividerVertical</item>
<item name="actionBarItemBackground">@null</item>

<item name="actionModeCutDrawable">@drawable/ic_menu_cut_holo_dark</item>
<item name="actionModeCopyDrawable">@drawable/ic_menu_copy_holo_dark</item>
Expand All @@ -364,8 +353,6 @@ please see themes_device_defaults.xml.
<item name="actionModeFindDrawable">@drawable/ic_menu_find_holo_dark</item>
<item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_holo_dark</item>

<item name="toolbarStyle">@null</item>

<item name="dividerVertical">?attr/listDivider</item>
<item name="dividerHorizontal">?attr/listDivider</item>
<item name="buttonBarStyle">@style/Holo.ButtonBar</item>
Expand Down Expand Up @@ -416,10 +403,6 @@ please see themes_device_defaults.xml.
<item name="colorButtonNormal">@color/holo_button_normal</item>
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>

<!-- Tooltip popup properties -->
<item name="tooltipForegroundColor">@null</item>
<item name="tooltipBackgroundColor">@null</item>

<!-- Holo-only color attributes -->
<item name="colorPressedHighlight">@color/holo_gray_light</item>
<item name="colorLongPressedHighlight">@color/holo_gray_bright</item>
Expand Down Expand Up @@ -496,7 +479,6 @@ please see themes_device_defaults.xml.

<item name="textAppearanceLargePopupMenu">@style/TextAppearance.Holo.Light.Widget.PopupMenu.Large</item>
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Holo.Light.Widget.PopupMenu.Small</item>
<item name="textAppearancePopupMenuHeader">@null</item>

<!-- Button styles -->
<item name="buttonStyle">@style/Widget.Holo.Light.Button</item>
Expand Down Expand Up @@ -636,7 +618,6 @@ please see themes_device_defaults.xml.
<item name="gridViewStyle">@style/Widget.Holo.Light.GridView</item>
<item name="imageButtonStyle">@style/Widget.Holo.Light.ImageButton</item>
<item name="imageWellStyle">@style/Widget.Holo.Light.ImageWell</item>
<item name="listMenuViewStyle">@null</item>
<item name="listViewStyle">@style/Widget.Holo.Light.ListView</item>
<item name="listViewWhiteStyle">@style/Widget.Holo.Light.ListView.White</item>
<item name="popupWindowStyle">@style/Widget.Holo.Light.PopupWindow</item>
Expand Down Expand Up @@ -677,11 +658,9 @@ please see themes_device_defaults.xml.
<item name="quickContactBadgeStyleSmallWindowLarge">@style/Widget.Holo.QuickContactBadgeSmall.WindowLarge</item>
<item name="listPopupWindowStyle">@style/Widget.Holo.Light.ListPopupWindow</item>
<item name="popupMenuStyle">@style/Widget.Holo.Light.PopupMenu</item>
<item name="popupTheme">@null</item>
<item name="stackViewStyle">@style/Widget.Holo.StackView</item>
<item name="activityChooserViewStyle">@style/Widget.Holo.Light.ActivityChooserView</item>
<item name="fragmentBreadCrumbsStyle">@style/Widget.Holo.Light.FragmentBreadCrumbs</item>
<item name="contextPopupMenuStyle">@null</item>

<!-- Preference styles -->
<item name="preferenceScreenStyle">@style/Preference.Holo.PreferenceScreen</item>
Expand All @@ -698,11 +677,6 @@ please see themes_device_defaults.xml.
<item name="editTextPreferenceStyle">@style/Preference.Holo.DialogPreference.EditTextPreference</item>
<item name="ringtonePreferenceStyle">@style/Preference.Holo.RingtonePreference</item>
<item name="preferenceLayoutChild">@layout/preference_child_holo</item>
<item name="preferencePanelStyle">@null</item>
<item name="preferenceHeaderPanelStyle">@null</item>
<item name="preferenceListStyle">@null</item>
<item name="preferenceFragmentListStyle">@null</item>
<item name="preferenceFragmentPaddingSide">@null</item>
<item name="detailsElementBackground">@drawable/panel_bg_holo_light</item>

<!-- PreferenceFrameLayout attributes -->
Expand All @@ -727,12 +701,9 @@ please see themes_device_defaults.xml.
<item name="actionBarStyle">@style/Widget.Holo.Light.ActionBar.Solid</item>
<item name="actionBarSize">@dimen/action_bar_default_height</item>
<item name="actionModePopupWindowStyle">@style/Widget.Holo.Light.PopupWindow.ActionMode</item>
<item name="actionMenuTextAppearance">@null</item>
<item name="actionMenuTextColor">@null</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarPopupTheme">?attr/popupTheme</item>
<item name="actionBarTheme">@null</item>
<item name="actionBarItemBackground">@null</item>

<item name="actionModeCutDrawable">@drawable/ic_menu_cut_holo_light</item>
<item name="actionModeCopyDrawable">@drawable/ic_menu_copy_holo_light</item>
Expand All @@ -742,8 +713,6 @@ please see themes_device_defaults.xml.
<item name="actionModeFindDrawable">@drawable/ic_menu_find_holo_light</item>
<item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_holo_light</item>

<item name="toolbarStyle">@null</item>

<item name="dividerVertical">?attr/listDivider</item>
<item name="dividerHorizontal">?attr/listDivider</item>
<item name="buttonBarStyle">@style/Holo.Light.ButtonBar</item>
Expand Down Expand Up @@ -791,10 +760,6 @@ please see themes_device_defaults.xml.
<item name="colorButtonNormal">@color/holo_light_button_normal</item>
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>

<!-- Tooltip popup properties -->
<item name="tooltipForegroundColor">@null</item>
<item name="tooltipBackgroundColor">@null</item>

<!-- Holo-only color attributes -->
<item name="colorPressedHighlight">@color/holo_gray_light</item>
<item name="colorLongPressedHighlight">@color/holo_gray_bright</item>
Expand Down

0 comments on commit 2fc8afa

Please sign in to comment.