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

Commit b178c547 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Fix the suggestion button distortion" into sc-dev

parents 0b1f5144 88630158

res/layout/settings_homepage_container.xml

+4 −1
Original line number Diff line number Diff line
@@ -70,13 +70,16 @@ 
                android:layout_width="match_parent"

                android:layout_height="@dimen/suggestion_height"

                android:paddingHorizontal="@dimen/suggestion_padding_horizontal"

                android:paddingBottom="@dimen/suggestion_padding_bottom"

                android:paddingVertical="@dimen/suggestion_padding_vertical"

                android:orientation="vertical"

                android:gravity="bottom"

                android:visibility="gone">



                <TextView

                    android:id="@+id/suggestion_title"

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1"

                    android:text="@string/settings_label"

                    style="@style/ContextualSuggestionText"/>

res/values/dimens.xml

+5 −1
Original line number Diff line number Diff line
@@ -141,10 +141,14 @@ 
    <!-- Contextual suggestions -->

    <dimen name="suggestion_height">232dp</dimen>

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

    <dimen name="suggestion_padding_bottom">8dp</dimen>

    <dimen name="suggestion_padding_vertical">8dp</dimen>

    <dimen name="suggestion_button_margin_top">16dp</dimen>

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



    <!-- Tool bar text -->

    <dimen name="tool_bar_max_text_size">36sp</dimen>

    <dimen name="tool_bar_min_text_size">24sp</dimen>



    <!-- Dimensions for Wifi Assistant Card -->

    <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>

    <dimen name="wifi_assistant_padding_start_end">16dp</dimen>

res/values/styles.xml

+10 −9
Original line number Diff line number Diff line
@@ -789,12 +789,13 @@ 
        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>



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

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

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

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

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

    <style name="ContextualSuggestionText"

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

        <item name="android:autoSizeTextType">uniform</item>

        <item name="android:autoSizeMaxTextSize">@dimen/tool_bar_max_text_size</item>

        <item name="android:autoSizeMinTextSize">@dimen/tool_bar_min_text_size</item>

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

        <item name="android:gravity">bottom</item>

    </style>



    <style name="RequestManageCredentialsButtonPanel">
@@ -888,10 +889,10 @@ 


    <style name="ToolbarText"

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

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

        <item name="android:textSize">@dimen/tool_bar_max_text_size</item>

    </style>



    <style name="ToolbarText.MoreThanTwoLines">

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

        <item name="android:textSize">@dimen/tool_bar_min_text_size</item>

    </style>

</resources>