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

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

Merge "Add styles and attributes in SettingsLib"

parents d785156e de3a8504

packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -43,4 +43,8 @@ 
    <color name="settingslib_accent_primary_variant">@android:color/system_accent1_300</color>



    <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_50</color>



    <color name="settingslib_text_color_secondary_device_default">@android:color/system_neutral2_200</color>



    <color name="settingslib_text_color_preference_category_title">@android:color/system_accent1_100</color>

</resources>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -65,4 +65,8 @@ 
    <color name="settingslib_background_device_default_light">@android:color/system_neutral1_50</color>



    <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_900</color>



    <color name="settingslib_text_color_secondary_device_default">@android:color/system_neutral2_700</color>



    <color name="settingslib_text_color_preference_category_title">@android:color/system_accent1_600</color>

</resources>

packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -20,4 +20,9 @@ 
    <dimen name="app_icon_min_width">52dp</dimen>

    <dimen name="settingslib_preferred_minimum_touch_target">48dp</dimen>

    <dimen name="settingslib_dialogCornerRadius">28dp</dimen>



    <!-- Left padding of the preference -->

    <dimen name="settingslib_listPreferredItemPaddingStart">24dp</dimen>

    <!-- Right padding of the preference -->

    <dimen name="settingslib_listPreferredItemPaddingEnd">24dp</dimen>

</resources>

packages/SettingsLib/SettingsTheme/res/values-v31/styles.xml

+7 −1
Original line number Diff line number Diff line
@@ -17,13 +17,19 @@ 
<resources>

    <style name="TextAppearance.PreferenceTitle.SettingsLib"

           parent="@android:style/TextAppearance.Material.Subhead">

        <item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>

        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>

        <item name="android:textSize">20sp</item>

    </style>



    <style name="TextAppearance.PreferenceSummary.SettingsLib"

           parent="@android:style/TextAppearance.DeviceDefault.Small">

        <item name="android:textColor">@color/settingslib_text_color_secondary_device_default</item>

    </style>



    <style name="TextAppearance.CategoryTitle.SettingsLib"

           parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textColor">@color/settingslib_text_color_preference_category_title</item>

        <item name="android:textSize">14sp</item>

    </style>

packages/SettingsLib/SettingsTheme/res/values-v31/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    <!-- Only using in Settings application -->

    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" >

        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>

        <item name="android:listPreferredItemPaddingStart">24dp</item>

        <item name="android:listPreferredItemPaddingLeft">24dp</item>

        <item name="android:listPreferredItemPaddingStart">@dimen/settingslib_listPreferredItemPaddingStart</item>

        <item name="android:listPreferredItemPaddingLeft">@dimen/settingslib_listPreferredItemPaddingStart</item>

        <item name="android:listPreferredItemPaddingEnd">16dp</item>

        <item name="android:listPreferredItemPaddingRight">16dp</item>

        <item name="preferenceTheme">@style/PreferenceTheme.SettingsLib</item>