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

Commit 7e123f52 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Update more dialog themes to use medium headline font. 

Updates more of the DeviceDefault Dialog themes to use
DialogWindowTitle.DeviceDefault and other related styles.

Also updates DialogWindowTitle.DeviceDefault to use the medium headline
font config for its fontFamily to enable OEM customization.

Bug: 70296667
Test: visual inspection
Change-Id: I77adba91d62caf327f96e237d1dd30126ef555c6
parent 4f9d750e

core/res/res/values/styles_device_defaults.xml

+13 −5
Original line number Diff line number Diff line
@@ -246,8 +246,12 @@ easier. 
    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle" parent="TextAppearance.Material.Widget.ActionBar.Subtitle"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Title" parent="TextAppearance.Material.Widget.ActionMode.Title"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Subtitle" parent="TextAppearance.Material.Widget.ActionMode.Subtitle"/>

    <style name="TextAppearance.DeviceDefault.WindowTitle" parent="TextAppearance.Material.WindowTitle"/>

    <style name="TextAppearance.DeviceDefault.DialogWindowTitle" parent="TextAppearance.Material.DialogWindowTitle"/>

    <style name="TextAppearance.DeviceDefault.WindowTitle" parent="TextAppearance.Material.WindowTitle">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.DialogWindowTitle" parent="TextAppearance.Material.DialogWindowTitle">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Material.Widget.ActionBar.Title.Inverse"/>

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->
@@ -280,11 +284,15 @@ easier. 
    <style name="Animation.DeviceDefault.Dialog" parent="Animation.Material.Dialog"/>



    <!-- DialogWindowTitle Styles -->

    <style name="DialogWindowTitle.DeviceDefault" parent="DialogWindowTitle.Material"/>

    <style name="DialogWindowTitle.DeviceDefault.Light" parent="DialogWindowTitle.Material.Light"/>

    <style name="DialogWindowTitle.DeviceDefault" parent="DialogWindowTitle.Material">

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

    </style>

    <style name="DialogWindowTitle.DeviceDefault.Light"/>



    <!-- WindowTitle Styles -->

    <style name="WindowTitle.DeviceDefault" parent="WindowTitle.Material"/>

    <style name="WindowTitle.DeviceDefault" parent="WindowTitle.Material">

        <item name="textAppearance">@style/TextAppearance.DeviceDefault.WindowTitle</item>

    </style>

    <style name="WindowTitleBackground.DeviceDefault" parent="WindowTitleBackground.Material"/>



    <!-- Other Styles -->

core/res/res/values/themes_device_defaults.xml

+27 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,9 @@ easier. 
    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a

    regular dialog. -->

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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
@@ -1026,6 +1029,9 @@ easier. 


     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->

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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
@@ -1050,6 +1056,9 @@ easier. 
    <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum

    width for a regular dialog. -->

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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
@@ -1100,6 +1109,9 @@ easier. 
    <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller

    screens (small, normal) or as a dialog on larger screens (large, xlarge). -->

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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
@@ -1125,6 +1137,9 @@ easier. 
    full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,

    xlarge). -->

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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
@@ -1148,6 +1163,9 @@ easier. 


    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->

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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
@@ -1361,6 +1379,9 @@ easier. 
    </style>



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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
@@ -1384,6 +1405,9 @@ easier. 
    </style>



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

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

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



        <!-- Color palette -->

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

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
@@ -1407,6 +1431,9 @@ easier. 
    </style>



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

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

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



        <!-- Color palette -->

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

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