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

Commit bb99fe0b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add DeviceDefault text styles for Settings."

parents bb459ce7 4e4ace47

core/res/res/values/styles_device_defaults.xml

+24 −0
Original line number Diff line number Diff line
@@ -355,6 +355,30 @@ easier. 
        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

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

    <style name="TextAppearance.DeviceDefault.Widget.Toolbar.Subtitle" parent="TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle"/>

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

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

    </style>

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

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

    </style>

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

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

    </style>

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

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

    </style>

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

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

    </style>

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

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

    </style>

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

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

    </style>

    <style name="TextAppearance.DeviceDefault.ListItem" parent="TextAppearance.DeviceDefault.Subhead"/>

    <style name="TextAppearance.DeviceDefault.ListItemSecondary" parent="TextAppearance.DeviceDefault.Body1"/>



    <!-- Preference Styles -->

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

core/res/res/values/themes_device_defaults.xml

+17 −24
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ easier. 
        <item name="textAppearanceLargePopupMenu">@style/TextAppearance.DeviceDefault.Widget.PopupMenu.Large</item>

        <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.DeviceDefault.Widget.PopupMenu.Small</item>



        <item name="textAppearanceListItem">@style/TextAppearance.DeviceDefault.ListItem</item>

        <item name="textAppearanceListItemSmall">@style/TextAppearance.DeviceDefault.ListItem</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.DeviceDefault.ListItemSecondary</item>



        <!-- Button styles -->

        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>

        <item name="buttonStyle">@style/Widget.DeviceDefault.Button</item>
@@ -783,7 +787,6 @@ easier. 
        <!-- Text styles -->

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

        <item name="textAppearanceInverse">@style/TextAppearance.DeviceDefault.Inverse</item>



        <item name="textAppearanceLarge">@style/TextAppearance.DeviceDefault.Large</item>

        <item name="textAppearanceMedium">@style/TextAppearance.DeviceDefault.Medium</item>

        <item name="textAppearanceSmall">@style/TextAppearance.DeviceDefault.Small</item>
@@ -792,11 +795,12 @@ easier. 
        <item name="textAppearanceSmallInverse">@style/TextAppearance.DeviceDefault.Small.Inverse</item>

        <item name="textAppearanceSearchResultTitle">@style/TextAppearance.DeviceDefault.SearchResult.Title</item>

        <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.DeviceDefault.SearchResult.Subtitle</item>



        <item name="textAppearanceButton">@style/TextAppearance.DeviceDefault.Widget.Button</item>



        <item name="textAppearanceLargePopupMenu">@style/TextAppearance.DeviceDefault.Widget.PopupMenu.Large</item>

        <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.DeviceDefault.Widget.PopupMenu.Small</item>

        <item name="textAppearanceListItem">@style/TextAppearance.DeviceDefault.ListItem</item>

        <item name="textAppearanceListItemSmall">@style/TextAppearance.DeviceDefault.ListItem</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.DeviceDefault.ListItemSecondary</item>



        <!-- Button styles -->

        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>
@@ -1439,19 +1443,23 @@ easier. 
    </style>



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

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

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

        <!-- From Theme.Material.Light.LightStatusBar -->

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



        <!-- From Theme.Material.Settings -->

        <item name="homeAsUpIndicator">@drawable/ic_ab_back_material_settings</item>

        <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>



        <!-- action bar -->

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

        <item name="actionBarTheme">@style/ThemeOverlay.DeviceDefault.ActionBar</item>

        <item name="popupTheme">@style/ThemeOverlay.DeviceDefault.Popup.Light</item>



        <!-- Color palette -->

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

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

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

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

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

        <item name="colorError">@color/error_color_device_default_light</item>

        <item name="colorEdgeEffect">@android:color/black</item>



        <!-- Add white nav bar with divider that matches material -->
@@ -1459,24 +1467,9 @@ easier. 
        <item name="navigationBarColor">@android:color/white</item>

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



        <!-- Dialog attributes -->

        <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>



        <!-- Text styles -->

        <item name="textAppearanceButton">@style/TextAppearance.DeviceDefault.Widget.Button</item>



        <!-- Button styles -->

        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>

        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->

        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>



        <item name="listDivider">@color/list_divider_color_light</item>

    </style>