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

Commit c8c1b530 authored by Edgar Wang's avatar Edgar Wang
Browse files

Refactor CollapsingToolbarLayout style in Settings 

- using style to contrtol also can benifit other partners

Bug: 335674192
Test: visual
Change-Id: Ia5c4956c11695a1e8c27634da8ee4984478ae368
parent d24f7b2d

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

+2 −14
Original line number Diff line number Diff line
@@ -32,21 +32,9 @@ 
            android:id="@+id/collapsing_toolbar"

            android:layout_width="match_parent"

            android:layout_height="@dimen/settingslib_toolbar_layout_height"

            android:clipToPadding="false"

            app:forceApplySystemWindowInsetTop="true"

            app:extraMultilineHeightEnabled="true"

            app:contentScrim="@color/settingslib_colorSurfaceHeader"

            app:maxLines="3"

            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"

            app:scrimAnimationDuration="50"

            app:scrimVisibleHeightTrigger="@dimen/settingslib_scrim_visible_height_trigger"

            app:statusBarScrim="@null"

            app:titleCollapseMode="fade"

            app:collapsedTitleTextAppearance="@style/CollapsingToolbarTitle.Collapsed"

            app:expandedTitleTextAppearance="@style/CollapsingToolbarTitle.Expanded"

            app:expandedTitleMarginStart="@dimen/expanded_title_margin_start"

            app:expandedTitleMarginEnd="@dimen/expanded_title_margin_end"

            app:toolbarId="@id/action_bar">

            app:toolbarId="@id/action_bar"

            style="@style/CollapsingToolbarLayoutStyle.SettingsLib">



            <Toolbar

                android:id="@+id/action_bar"

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

+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@ 
    <dimen name="settingslib_scrim_visible_height_trigger">137dp</dimen>

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

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

    <dimen name="expanded_title_margin_bottom">32dp</dimen>

</resources>
 
 No newline at end of file

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

+18 −2
Original line number Diff line number Diff line
@@ -18,11 +18,27 @@ 
    <style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

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

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

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

    </style>



    <style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">

        <item name="android:textSize">36dp</item>

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

    </style>



    <style name="Base.CollapsingToolbarLayoutStyle.SettingsLib" parent="@style/Widget.Material3.CollapsingToolbar">

        <item name="expandedTitleTextAppearance">@style/CollapsingToolbarTitle.Expanded</item>

        <item name="collapsedTitleTextAppearance">@style/CollapsingToolbarTitle.Collapsed</item>

        <item name="expandedTitleMarginStart">@dimen/expanded_title_margin_start</item>

        <item name="expandedTitleMarginEnd">@dimen/expanded_title_margin_end</item>

        <item name="expandedTitleMarginBottom">@dimen/expanded_title_margin_bottom</item>

        <item name="maxLines">3</item>

        <item name="scrimVisibleHeightTrigger">@dimen/settingslib_scrim_visible_height_trigger</item>

        <item name="contentScrim">@color/settingslib_colorSurfaceHeader</item>

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

        <item name="scrimAnimationDuration">50</item>

    </style>



    <style name="CollapsingToolbarLayoutStyle.SettingsLib" parent="@style/Base.CollapsingToolbarLayoutStyle.SettingsLib">

        <item name="collapsedTitleTextColor">@color/settingslib_text_color_primary_device_default</item>

        <item name="expandedTitleTextColor">@color/settingslib_text_color_primary_device_default</item>

    </style>

</resources>
 
 No newline at end of file

packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles.xml

+3 −9
Original line number Diff line number Diff line
@@ -15,14 +15,8 @@ 
  limitations under the License.

-->

<resources>

    <style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

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

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

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

    </style>



    <style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">

        <item name="android:textSize">36dp</item>

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

    <style name="CollapsingToolbarLayoutStyle.SettingsLib" parent="@style/Base.CollapsingToolbarLayoutStyle.SettingsLib">

        <item name="collapsedTitleTextColor">@color/settingslib_materialColorOnSurface</item>

        <item name="expandedTitleTextColor">@color/settingslib_materialColorOnSurface</item>

    </style>

</resources>
 
 No newline at end of file