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

Commit fc2cf830 authored by Alan Viverette's avatar Alan Viverette
Browse files

Add working DarkActionBar theme, fix DeviceDefault action bar 

Change-Id: I3a1542acd8ed04382477821659c926938d0b039f
parent 3bb41a20

api/current.txt

+139 −134

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/public.xml

+6 −0
Original line number Diff line number Diff line
@@ -2269,6 +2269,12 @@ 
  <public type="style" name="Theme.Quantum.Light.NoActionBar.TranslucentDecor" />

  <public type="style" name="Theme.Quantum.Light.Panel" />



  <public type="style" name="ThemeOverlay" />

  <public type="style" name="ThemeOverlay.Quantum" />

  <public type="style" name="ThemeOverlay.Quantum.Light" />

  <public type="style" name="ThemeOverlay.Quantum.Dark" />

  <public type="style" name="ThemeOverlay.Quantum.ActionBarWidget" />



  <public type="style" name="Widget.Quantum" />

  <public type="style" name="Widget.Quantum.ActionBar" />

  <public type="style" name="Widget.Quantum.ActionBar.Solid" />

core/res/res/values/themes_device_defaults.xml

+3 −14
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ easier. 
        <item name="actionBarTabTextStyle">@style/Widget.DeviceDefault.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.DeviceDefault.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.DeviceDefault.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@style/Widget.DeviceDefault.ActionBar</item>

        <item name="actionBarStyle">@style/Widget.DeviceDefault.ActionBar.Solid</item>

        <item name="actionModePopupWindowStyle">@style/Widget.DeviceDefault.PopupWindow.ActionMode</item>



        <item name="buttonBarStyle">@style/DeviceDefault.ButtonBar</item>
@@ -435,7 +435,7 @@ easier. 
        <item name="actionBarTabTextStyle">@style/Widget.DeviceDefault.Light.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.DeviceDefault.Light.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.DeviceDefault.Light.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@style/Widget.DeviceDefault.Light.ActionBar</item>

        <item name="actionBarStyle">@style/Widget.DeviceDefault.Light.ActionBar.Solid</item>

        <item name="actionModePopupWindowStyle">@style/Widget.DeviceDefault.Light.PopupWindow.ActionMode</item>



        <item name="buttonBarStyle">@style/DeviceDefault.Light.ButtonBar</item>
@@ -469,18 +469,7 @@ easier. 


    <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an

    inverse color profile. -->

    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Quantum.Light.DarkActionBar" >

        <item name="actionBarStyle">@style/Widget.DeviceDefault.Light.ActionBar.Solid.Inverse</item>

        <item name="actionDropDownStyle">@style/Widget.DeviceDefault.Spinner.DropDown.ActionBar</item>

        <item name="actionButtonStyle">@style/Widget.DeviceDefault.ActionButton</item>

        <item name="actionOverflowButtonStyle">@style/Widget.DeviceDefault.ActionButton.Overflow</item>

        <item name="actionBarTabStyle">@style/Widget.DeviceDefault.Light.ActionBar.TabView.Inverse</item>

        <item name="actionBarTabBarStyle">@style/Widget.DeviceDefault.Light.ActionBar.TabBar.Inverse</item>

        <item name="actionBarTabTextStyle">@style/Widget.DeviceDefault.Light.ActionBar.TabText.Inverse</item>

        <item name="actionModeStyle">@style/Widget.DeviceDefault.Light.ActionMode.Inverse</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.DeviceDefault.ActionButton.CloseMode</item>

        <item name="actionModePopupWindowStyle">@style/Widget.DeviceDefault.PopupWindow.ActionMode</item>

    </style>

    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Quantum.Light.DarkActionBar" />



    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->

    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Quantum.Light.NoActionBar"  />

core/res/res/values/themes_quantum.xml

+84 −20
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ please see themes_device_defaults.xml. 
        <item name="actionBarStyle">@style/Widget.Quantum.ActionBar.Solid</item>

        <item name="actionBarSize">@dimen/action_bar_default_height_quantum</item>

        <item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item>

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

        <item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>

        <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>

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

        <item name="actionBarItemBackground">@drawable/item_background_quantum</item>



        <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item>
@@ -646,8 +646,8 @@ please see themes_device_defaults.xml. 
        <item name="actionBarStyle">@style/Widget.Quantum.Light.ActionBar.Solid</item>

        <item name="actionBarSize">@dimen/action_bar_default_height_quantum</item>

        <item name="actionModePopupWindowStyle">@style/Widget.Quantum.Light.PopupWindow.ActionMode</item>

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

        <item name="actionBarTheme">@style/ThemeOverlay.Quantum.Light.ActionBarWidget</item>

        <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>

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

        <item name="actionBarItemBackground">@drawable/item_background_quantum</item>



        <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item>
@@ -718,29 +718,93 @@ please see themes_device_defaults.xml. 
        <item name="colorButtonPressed">@color/quantum_grey_500</item>

    </style>



    <!-- Variant of the quantum (light) theme that has a solid (opaque) action bar

         with an inverse color profile. The dark action bar sharply stands out against

         the light content. -->

    <style name="Theme.Quantum.Light.DarkActionBar">

        <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>

        <item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark</item>

    </style>



    <style name="ThemeOverlay" />

    <style name="ThemeOverlay.Quantum" />

    <style name="ThemeOverlay.Quantum.Light" />



    <!-- Variant of the quantum theme that replaces the activated control color

         (which by default is identical to the action bar background color) with

         the normal control color . -->

    <style name="ThemeOverlay.Quantum.ActionBarWidget">

        <item name="colorControlActivated">?attr/colorControlNormal</item>

    <!-- Theme overlay that replaces colors with their light versions but preserves

         the value of colorAccent, colorPrimary and its variants. -->

    <style name="ThemeOverlay.Quantum.Light">

        <item name="colorForeground">@color/bright_foreground_quantum_light</item>

        <item name="colorForegroundInverse">@color/bright_foreground_quantum_dark</item>

        <item name="colorBackground">@color/background_quantum_light</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_quantum_light</item>



        <item name="textColorPrimary">@color/primary_text_quantum_light</item>

        <item name="textColorPrimaryInverse">@color/primary_text_quantum_dark</item>

        <item name="textColorSecondary">@color/secondary_text_quantum_light</item>

        <item name="textColorSecondaryInverse">@color/secondary_text_quantum_dark</item>

        <item name="textColorTertiary">@color/tertiary_text_quantum_light</item>

        <item name="textColorTertiaryInverse">@color/tertiary_text_quantum_dark</item>

        <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_quantum_light</item>

        <item name="textColorPrimaryInverseDisableOnly">@color/primary_text_disable_only_quantum_dark</item>

        <item name="textColorHint">@color/hint_foreground_quantum_light</item>

        <item name="textColorHintInverse">@color/hint_foreground_quantum_dark</item>

        <item name="textColorHighlight">@color/highlighted_text_quantum_light</item>

        <item name="textColorHighlightInverse">@color/highlighted_text_quantum_dark</item>

        <item name="textColorLink">@color/quantum_teal_500</item>

        <item name="textColorLinkInverse">@color/quantum_teal_500</item>

        <item name="textColorSearchUrl">@color/search_url_text_quantum_light</item>

        <item name="textColorAlertDialogListItem">@color/primary_text_quantum_light</item>



        <item name="textCheckMark">@drawable/indicator_check_mark_light</item>

        <item name="textCheckMarkInverse">@drawable/indicator_check_mark_dark</item>



        <item name="windowBackground">@color/background_quantum_light</item>



        <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item>

        <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item>



        <item name="colorButtonNormal">@color/quantum_grey_100</item>

    </style>



    <!-- Variant of the quantum (light) theme that replaces the activated control

         color (which by default is identical to the action bar background color)

         with the normal control color . -->

    <style name="ThemeOverlay.Quantum.Light.ActionBarWidget">

        <item name="colorControlActivated">?attr/colorControlNormal</item>

    <!-- Theme overlay that replaces colors with their dark versions but preserves

         the value of colorAccent, colorPrimary and its variants. -->

    <style name="ThemeOverlay.Quantum.Dark">

        <item name="colorForeground">@color/bright_foreground_quantum_dark</item>

        <item name="colorForegroundInverse">@color/bright_foreground_quantum_light</item>

        <item name="colorBackground">@color/background_quantum_dark</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_quantum_dark</item>



        <item name="textColorPrimary">@color/primary_text_quantum_dark</item>

        <item name="textColorPrimaryInverse">@color/primary_text_quantum_light</item>

        <item name="textColorPrimaryDisableOnly">@color/primary_text_disable_only_quantum_dark</item>

        <item name="textColorSecondary">@color/secondary_text_quantum_dark</item>

        <item name="textColorSecondaryInverse">@color/secondary_text_quantum_light</item>

        <item name="textColorTertiary">@color/tertiary_text_quantum_dark</item>

        <item name="textColorTertiaryInverse">@color/tertiary_text_quantum_light</item>

        <item name="textColorHint">@color/hint_foreground_quantum_dark</item>

        <item name="textColorHintInverse">@color/hint_foreground_quantum_light</item>

        <item name="textColorHighlight">@color/highlighted_text_quantum_dark</item>

        <item name="textColorHighlightInverse">@color/highlighted_text_quantum_light</item>

        <item name="textColorLink">@color/quantum_teal_500</item>

        <item name="textColorLinkInverse">@color/quantum_teal_500</item>

        <item name="textColorSearchUrl">@color/search_url_text_quantum_dark</item>

        <item name="textColorAlertDialogListItem">@color/primary_text_quantum_dark</item>



        <item name="textCheckMark">@drawable/indicator_check_mark_dark</item>

        <item name="textCheckMarkInverse">@drawable/indicator_check_mark_light</item>



        <item name="windowBackground">@color/background_quantum_dark</item>



        <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item>

        <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item>



        <item name="colorButtonNormal">@color/quantum_grey_700</item>

    </style>



    <!-- Variant of the quantum (light) theme that has a solid (opaque) action bar

         with an inverse color profile. The dark action bar sharply stands out against

         the light content. -->

    <style name="Theme.Quantum.Light.DarkActionBar">

        <!-- TODO -->

    <!-- Theme overlay that replaces the activated control color (which by default

         is identical to the action bar background color) with the normal control

         color. -->

    <style name="ThemeOverlay.Quantum.ActionBarWidget">

        <item name="colorControlActivated">?attr/colorControlNormal</item>

    </style>



    <!-- Variant of the quantum (dark) theme with no action bar. -->