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

Commit c325a5be authored by Jakub Adamek's avatar Jakub Adamek Committed by android-build-merger
Browse files

Revert "Improving customization in DeviceDefault themes." 

am: 801cb62b

Change-Id: I776b20ca5f5dcc6ec9e6d0f8133f33cb4ccda295
parents 629ad7e3 801cb62b

core/res/res/values/themes_device_defaults.xml

+108 −33
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ easier. 
        <item name="colorBackground">@color/background_floating_device_default_dark</item>

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

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

    </style>



    <!-- Variant of {@link #Theme_DeviceDefault_Dialog} that has a nice minimum width for a
@@ -353,17 +352,27 @@ easier. 
    <!-- DeviceDefault style for input methods, which is used by the

         {@link android.service.voice.VoiceInteractionSession} class.-->

    <style name="Theme.DeviceDefault.VoiceInteractionSession" parent="Theme.Material.VoiceInteractionSession">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

    </style>



    <style name="Theme.DeviceDefault.Dialog.Alert">

        <item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>

        <item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>

    <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert">

        <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item>



        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

    </style>



    <style name="Theme.DeviceDefault.SearchBar" parent="Theme.DeviceDefault.Panel"/>

    <style name="Theme.DeviceDefault.SearchBar" parent="Theme.Material.SearchBar">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

    </style>



    <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame">

        <!-- Color palette -->
@@ -542,7 +551,6 @@ easier. 
        <item name="colorBackground">@color/background_device_default_dark</item>

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

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

    </style>



    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
@@ -597,7 +605,6 @@ easier. 
        <item name="colorBackground">@color/background_device_default_dark</item>

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

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

    </style>



    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -652,60 +659,120 @@ easier. 
    decorations, so you basically have an empty rectangle in which to place your content. It makes

    the window floating, with a transparent background, and turns off dimming behind the window. -->

    <style name="Theme.DeviceDefault.Light.Panel" parent="Theme.Material.Light.Panel">

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

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

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

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

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

        <item name="windowIsFloating">true</item>

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

        <item name="windowIsTranslucent">true</item>

        <item name="windowNoTitle">true</item>

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <style name="Theme.DeviceDefault.Light.Dialog.Alert">

        <item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>

        <item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.Alert">

        <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault.Light</item>



        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <style name="Theme.DeviceDefault.Light.SearchBar" parent="@style/Theme.DeviceDefault.Light.Panel"/>

    <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Material.Light.SearchBar">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <style name="Theme.DeviceDefault.Light.Voice" parent="@style/Theme.DeviceDefault.Light.Dialog">

        <item name="windowAnimationStyle">@style/Animation.VoiceActivity</item>

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

    <style name="Theme.DeviceDefault.Light.Voice" parent="Theme.Material.Light.Voice">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <!-- DeviceDefault theme for a window that should look like the Settings app.  -->

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

        <item name="presentationTheme">@style/Theme.Material.Settings.Dialog.Presentation</item>

        <item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>

        <item name="panelMenuListTheme">@style/Theme.Material.Settings.CompactMenu</item>

    <style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <!-- DeviceDefault theme for a window that should use Settings theme colors but has

         a full dark palette (instead of Light with dark action bar like

         Theme.DeviceDefault.Settings.  -->

    <style name="Theme.DeviceDefault.Settings.Dark" parent="Theme.DeviceDefault"/>

    <style name="Theme.DeviceDefault.Settings.Dark" parent="Theme.Material">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



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

    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="Theme.DeviceDefault.NoActionBar"/>

    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="Theme.Material.NoActionBar">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.DeviceDefault.Light.Dialog">

    <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.Material.Settings.Dialog">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="Theme.DeviceDefault.Light"/>

    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="Theme.Material.Settings.DialogWhenLarge">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.DeviceDefault.Light.Dialog.Alert">

    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.Alert">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>

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

    </style>



    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.Light">

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">

        <item name="windowIsTranslucent">true</item>

        <item name="windowNoTitle">true</item>

        <item name="windowBackground">@color/transparent</item>
@@ -715,6 +782,14 @@ easier. 
        <item name="colorControlActivated">?attr/colorControlHighlight</item>

        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>



        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

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

        <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item>

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

    </style>



    <!-- DeviceDefault theme for the default system theme.  -->