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

Commit 95743787 authored by Yu-Ta Lu's avatar Yu-Ta Lu Committed by Automerger Merge Worker
Browse files

Merge "Replace private attributes with public resources." into sc-dev am: 9c219f14 am: 0eb1cada 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522189

Change-Id: I5ed4a2e3996561687684cb600080022e2eb4a423
parents 6def5305 0eb1cada

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

+4 −4
Original line number Diff line number Diff line
@@ -33,18 +33,18 @@ 
    <style name="Banner.Title.SettingsLib"

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

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

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

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

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

    </style>



    <style name="Banner.Subtitle.SettingsLib"

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

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

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

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

    </style>



    <style name="Banner.Summary.SettingsLib"

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

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

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

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

    </style>

packages/SettingsLib/BannerMessagePreference/res/values/styles.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,14 +17,13 @@ 


<resources>

    <style name="Banner.Text.Title"

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

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

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

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

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

    </style>



    <style name="Banner.Text.Summary"

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

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

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

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

    </style>

packages/SettingsLib/BarChartPreference/res/values/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ 
    </style>



    <style name="BarChart.Text"

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

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

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

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

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

    </style>



    <style name="BarChart.Text.HeaderTitle">
@@ -99,7 +99,7 @@ 
    </style>



    <style name="BarChart.Text.Summary"

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

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

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

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

    </style>

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ android_library { 
        "com.google.android.material_material",

        "SettingsLibSettingsTransition",

        "SettingsLibUtils",

        "SettingsLibSettingsTheme",

    ],

    sdk_version: "system_current",

    min_sdk_version: "29",

packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
  -->

<androidx.coordinatorlayout.widget.CoordinatorLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/content_parent"

    android:layout_width="match_parent"
@@ -40,7 +39,7 @@ 
            android:clipToPadding="false"

            app:forceApplySystemWindowInsetTop="true"

            app:extraMultilineHeightEnabled="true"

            app:contentScrim="?androidprv:attr/colorSurfaceHeader"

            app:contentScrim="@color/settingslib_colorSurfaceHeader"

            app:maxLines="3"

            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"

            app:scrimAnimationDuration="50"