Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 045abe73 authored by Alan Viverette's avatar Alan Viverette
Browse files

Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs

Due to themes always overlaying, legacy and Holo themes must explicitly
define Material attributes as @null (e.g. unset).

Deprecates Holo themes. Nobody should be using these anymore.

Bug: 72203192
Test: CtsThemeHostTests & manual verification of bug
Change-Id: I65e9ceddc7aec54b1b8df0231f0755cbd5529886
parent 85a6db68
Loading
Loading
Loading
Loading
+28 −28
Original line number Diff line number Diff line
@@ -2215,34 +2215,34 @@ package android {
    field public static final int Theme_DeviceDefault_Wallpaper = 16974140; // 0x103013c
    field public static final int Theme_DeviceDefault_Wallpaper_NoTitleBar = 16974141; // 0x103013d
    field public static final int Theme_Dialog = 16973835; // 0x103000b
    field public static final int Theme_Holo = 16973931; // 0x103006b
    field public static final int Theme_Holo_Dialog = 16973935; // 0x103006f
    field public static final int Theme_Holo_DialogWhenLarge = 16973943; // 0x1030077
    field public static final int Theme_Holo_DialogWhenLarge_NoActionBar = 16973944; // 0x1030078
    field public static final int Theme_Holo_Dialog_MinWidth = 16973936; // 0x1030070
    field public static final int Theme_Holo_Dialog_NoActionBar = 16973937; // 0x1030071
    field public static final int Theme_Holo_Dialog_NoActionBar_MinWidth = 16973938; // 0x1030072
    field public static final int Theme_Holo_InputMethod = 16973951; // 0x103007f
    field public static final int Theme_Holo_Light = 16973934; // 0x103006e
    field public static final int Theme_Holo_Light_DarkActionBar = 16974105; // 0x1030119
    field public static final int Theme_Holo_Light_Dialog = 16973939; // 0x1030073
    field public static final int Theme_Holo_Light_DialogWhenLarge = 16973945; // 0x1030079
    field public static final int Theme_Holo_Light_DialogWhenLarge_NoActionBar = 16973946; // 0x103007a
    field public static final int Theme_Holo_Light_Dialog_MinWidth = 16973940; // 0x1030074
    field public static final int Theme_Holo_Light_Dialog_NoActionBar = 16973941; // 0x1030075
    field public static final int Theme_Holo_Light_Dialog_NoActionBar_MinWidth = 16973942; // 0x1030076
    field public static final int Theme_Holo_Light_NoActionBar = 16974064; // 0x10300f0
    field public static final int Theme_Holo_Light_NoActionBar_Fullscreen = 16974065; // 0x10300f1
    field public static final int Theme_Holo_Light_NoActionBar_Overscan = 16974302; // 0x10301de
    field public static final int Theme_Holo_Light_NoActionBar_TranslucentDecor = 16974306; // 0x10301e2
    field public static final int Theme_Holo_Light_Panel = 16973948; // 0x103007c
    field public static final int Theme_Holo_NoActionBar = 16973932; // 0x103006c
    field public static final int Theme_Holo_NoActionBar_Fullscreen = 16973933; // 0x103006d
    field public static final int Theme_Holo_NoActionBar_Overscan = 16974301; // 0x10301dd
    field public static final int Theme_Holo_NoActionBar_TranslucentDecor = 16974305; // 0x10301e1
    field public static final int Theme_Holo_Panel = 16973947; // 0x103007b
    field public static final int Theme_Holo_Wallpaper = 16973949; // 0x103007d
    field public static final int Theme_Holo_Wallpaper_NoTitleBar = 16973950; // 0x103007e
    field public static final deprecated int Theme_Holo = 16973931; // 0x103006b
    field public static final deprecated int Theme_Holo_Dialog = 16973935; // 0x103006f
    field public static final deprecated int Theme_Holo_DialogWhenLarge = 16973943; // 0x1030077
    field public static final deprecated int Theme_Holo_DialogWhenLarge_NoActionBar = 16973944; // 0x1030078
    field public static final deprecated int Theme_Holo_Dialog_MinWidth = 16973936; // 0x1030070
    field public static final deprecated int Theme_Holo_Dialog_NoActionBar = 16973937; // 0x1030071
    field public static final deprecated int Theme_Holo_Dialog_NoActionBar_MinWidth = 16973938; // 0x1030072
    field public static final deprecated int Theme_Holo_InputMethod = 16973951; // 0x103007f
    field public static final deprecated int Theme_Holo_Light = 16973934; // 0x103006e
    field public static final deprecated int Theme_Holo_Light_DarkActionBar = 16974105; // 0x1030119
    field public static final deprecated int Theme_Holo_Light_Dialog = 16973939; // 0x1030073
    field public static final deprecated int Theme_Holo_Light_DialogWhenLarge = 16973945; // 0x1030079
    field public static final deprecated int Theme_Holo_Light_DialogWhenLarge_NoActionBar = 16973946; // 0x103007a
    field public static final deprecated int Theme_Holo_Light_Dialog_MinWidth = 16973940; // 0x1030074
    field public static final deprecated int Theme_Holo_Light_Dialog_NoActionBar = 16973941; // 0x1030075
    field public static final deprecated int Theme_Holo_Light_Dialog_NoActionBar_MinWidth = 16973942; // 0x1030076
    field public static final deprecated int Theme_Holo_Light_NoActionBar = 16974064; // 0x10300f0
    field public static final deprecated int Theme_Holo_Light_NoActionBar_Fullscreen = 16974065; // 0x10300f1
    field public static final deprecated int Theme_Holo_Light_NoActionBar_Overscan = 16974302; // 0x10301de
    field public static final deprecated int Theme_Holo_Light_NoActionBar_TranslucentDecor = 16974306; // 0x10301e2
    field public static final deprecated int Theme_Holo_Light_Panel = 16973948; // 0x103007c
    field public static final deprecated int Theme_Holo_NoActionBar = 16973932; // 0x103006c
    field public static final deprecated int Theme_Holo_NoActionBar_Fullscreen = 16973933; // 0x103006d
    field public static final deprecated int Theme_Holo_NoActionBar_Overscan = 16974301; // 0x10301dd
    field public static final deprecated int Theme_Holo_NoActionBar_TranslucentDecor = 16974305; // 0x10301e1
    field public static final deprecated int Theme_Holo_Panel = 16973947; // 0x103007b
    field public static final deprecated int Theme_Holo_Wallpaper = 16973949; // 0x103007d
    field public static final deprecated int Theme_Holo_Wallpaper_NoTitleBar = 16973950; // 0x103007e
    field public static final int Theme_InputMethod = 16973908; // 0x1030054
    field public static final int Theme_Light = 16973836; // 0x103000c
    field public static final int Theme_Light_NoTitleBar = 16973837; // 0x103000d
+36 −27
Original line number Diff line number Diff line
@@ -41,58 +41,44 @@ please see themes_device_defaults.xml.
         #Theme_Holo} or {@link #Theme_DeviceDefault}.</p>
    -->
    <style name="Theme">

        <item name="isLightTheme">false</item>

        <item name="colorForeground">@color/bright_foreground_dark</item>
        <item name="colorForegroundInverse">@color/bright_foreground_dark_inverse</item>
        <item name="colorBackground">@color/background_dark</item>
        <item name="colorBackgroundFloating">?attr/colorBackground</item>
        <item name="colorBackgroundCacheHint">?attr/colorBackground</item>

        <item name="colorPressedHighlight">@color/legacy_pressed_highlight</item>
        <item name="colorLongPressedHighlight">@color/legacy_long_pressed_highlight</item>
        <item name="colorFocusedHighlight">@color/legacy_selected_highlight</item>
        <item name="colorMultiSelectHighlight">@color/legacy_selected_highlight</item>
        <item name="colorActivatedHighlight">@color/legacy_selected_highlight</item>

        <item name="colorPrimaryDark">@color/legacy_primary_dark</item>
        <item name="colorPrimary">@color/legacy_primary</item>
        <item name="colorSecondary">?attr/colorPrimary</item>
        <item name="colorControlActivated">@color/legacy_control_activated</item>
        <item name="colorControlNormal">@color/legacy_control_normal</item>
        <item name="colorControlHighlight">@color/legacy_button_pressed</item>
        <item name="colorButtonNormal">@color/legacy_button_normal</item>
        <item name="colorEdgeEffect">?attr/colorPrimary</item>
        <item name="colorError">@color/red</item>

        <item name="disabledAlpha">0.5</item>
        <item name="primaryContentAlpha">@dimen/primary_content_alpha_material_dark</item>
        <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_dark</item>
        <item name="backgroundDimAmount">0.6</item>
        <item name="colorError">@color/red</item>

        <!-- Text styles -->
        <item name="textAppearance">@style/TextAppearance</item>
        <item name="textAppearanceInverse">@style/TextAppearance.Inverse</item>

        <item name="textColorPrimary">@color/primary_text_dark</item>
        <item name="textColorSecondary">@color/secondary_text_dark</item>
        <item name="textColorTertiary">@color/tertiary_text_dark</item>
        <item name="textColorPrimaryInverse">@color/primary_text_light</item>
        <item name="textColorSecondaryInverse">@color/secondary_text_light</item>
        <item name="textColorTertiaryInverse">@color/tertiary_text_light</item>
        <item name="textColorPrimaryActivated">@color/primary_text_dark</item>
        <item name="textColorSecondaryActivated">@color/secondary_text_dark</item>
        <item name="textColorPrimaryDisableOnly">@color/primary_text_dark_disable_only</item>
        <item name="textColorPrimaryInverseDisableOnly">@color/primary_text_light_disable_only</item>
        <item name="textColorPrimaryInverseNoDisable">@color/primary_text_light_nodisable</item>
        <item name="textColorPrimaryNoDisable">@color/primary_text_dark_nodisable</item>
        <item name="textColorSecondary">@color/secondary_text_dark</item>
        <item name="textColorSecondaryInverse">@color/secondary_text_light</item>
        <item name="textColorSecondaryActivated">@color/secondary_text_dark</item>
        <item name="textColorSecondaryNoDisable">@color/secondary_text_dark_nodisable</item>
        <item name="textColorPrimaryInverseNoDisable">@color/primary_text_light_nodisable</item>
        <item name="textColorSecondaryInverseNoDisable">@color/secondary_text_light_nodisable</item>
        <item name="textColorTertiary">@color/tertiary_text_dark</item>
        <item name="textColorTertiaryInverse">@color/tertiary_text_light</item>
        <item name="textColorHint">@color/hint_foreground_dark</item>
        <item name="textColorHintInverse">@color/hint_foreground_light</item>
        <item name="textColorSearchUrl">@color/search_url_text</item>
        <item name="textColorHighlight">@color/highlighted_text_dark</item>
        <item name="textColorHighlightInverse">@color/highlighted_text_light</item>
        <item name="textColorLink">@color/link_text_dark</item>
        <item name="textColorLinkInverse">@color/link_text_light</item>
        <item name="textColorSearchUrl">@color/search_url_text</item>
        <item name="textColorAlertDialogListItem">@color/primary_text_light_disable_only</item>

        <item name="textAppearanceLarge">@style/TextAppearance.Large</item>
@@ -120,14 +106,19 @@ 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>

        <item name="buttonStyleSmall">@style/Widget.Button.Small</item>
        <item name="buttonStyleInset">@style/Widget.Button.Inset</item>

        <item name="buttonStyleToggle">@style/Widget.Button.Toggle</item>
        <item name="buttonCornerRadius">0dp</item>

        <item name="switchStyle">@style/Widget.CompoundButton.Switch</item>
        <item name="mediaRouteButtonStyle">@style/Widget.DeviceDefault.MediaRouteButton</item>

        <item name="selectableItemBackground">@drawable/item_background</item>
        <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item>
@@ -156,7 +147,6 @@ please see themes_device_defaults.xml.
        <item name="listChoiceIndicatorMultiple">@drawable/btn_check</item>

        <item name="listChoiceBackgroundIndicator">@drawable/list_selector_background</item>

        <item name="activatedBackgroundIndicator">@drawable/activated_background</item>

        <item name="listDividerAlertDialog">@drawable/divider_horizontal_bright</item>
@@ -215,6 +205,7 @@ please see themes_device_defaults.xml.
        <item name="dialogCustomTitleDecorLayout">@layout/dialog_custom_title</item>
        <item name="dialogTitleDecorLayout">@layout/dialog_title</item>
        <item name="dialogPreferredPadding">@dimen/dialog_padding</item>
        <item name="dialogCornerRadius">0dp</item>

        <!-- AlertDialog attributes -->
        <item name="alertDialogTheme">@style/Theme.Dialog.Alert</item>
@@ -239,6 +230,7 @@ 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>
@@ -316,8 +308,9 @@ 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="mediaRouteButtonStyle">@style/Widget.DeviceDefault.MediaRouteButton</item>
        <item name="fragmentBreadCrumbsStyle">@style/Widget.FragmentBreadCrumbs</item>
        <item name="contextPopupMenuStyle">?attr/popupMenuStyle</item>

@@ -432,6 +425,22 @@ please see themes_device_defaults.xml.
        <item name="fastScrollOverlayPosition">floating</item>
        <item name="fastScrollTextColor">@color/primary_text_dark</item>


        <item name="colorPressedHighlight">@color/legacy_pressed_highlight</item>
        <item name="colorLongPressedHighlight">@color/legacy_long_pressed_highlight</item>
        <item name="colorFocusedHighlight">@color/legacy_selected_highlight</item>
        <item name="colorMultiSelectHighlight">@color/legacy_selected_highlight</item>
        <item name="colorActivatedHighlight">@color/legacy_selected_highlight</item>

        <item name="colorPrimaryDark">@color/legacy_primary_dark</item>
        <item name="colorPrimary">@color/legacy_primary</item>
        <item name="colorSecondary">?attr/colorPrimary</item>
        <item name="colorControlActivated">@color/legacy_control_activated</item>
        <item name="colorControlNormal">@color/legacy_control_normal</item>
        <item name="colorControlHighlight">@color/legacy_button_pressed</item>
        <item name="colorButtonNormal">@color/legacy_button_normal</item>
        <item name="colorEdgeEffect">?attr/colorPrimary</item>

        <!-- Accessibility focused drawable -->
        <item name="accessibilityFocusedDrawable">@drawable/view_accessibility_focused</item>

+230 −91

File changed.

Preview size limit exceeded, changes collapsed.

+0 −1
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ please see themes_device_defaults.xml.
        <!-- DatePicker dialog theme -->
        <item name="datePickerDialogTheme">@style/ThemeOverlay.Material.Dialog.DatePicker</item>

        <!-- TODO: This belongs in a FastScroll style -->
        <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_material</item>
        <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_material</item>
        <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_material</item>