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

Commit a22768cc authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Search bar polish 

Updated main page text color, text size, and search bar height.
Also updated results page text size.

Change-Id: Ic4a390136b854741a73e99431b8dd9452871dd2c
Fixes: 63397599
Fixes: 63394285
Test: robotests and manual
parent 24ba2fbd

res/layout/search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            <Toolbar

                android:id="@+id/search_toolbar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="@dimen/search_bar_height"

                android:background="?android:attr/selectableItemBackground"

                android:contentInsetStart="0dp"

                android:contentInsetStartWithNavigation="0dp"

res/layout/settings_main_dashboard.xml

+3 −2
Original line number Diff line number Diff line
@@ -37,11 +37,12 @@ 
            <Toolbar

                android:id="@+id/search_action_bar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="@dimen/search_bar_height"

                android:background="?android:attr/selectableItemBackground"

                android:contentInsetStartWithNavigation="64dp"

                android:navigationIcon="@drawable/ic_search_24dp"

                android:titleTextColor="@*android:color/text_color_primary"

                android:title="@string/search_menu"

                android:titleTextAppearance="@style/TextAppearance.SearchBar"

                android:theme="?android:attr/actionBarTheme"/>

        </android.support.v7.widget.CardView>

    </FrameLayout>

res/values-sw600dp/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ 
    <dimen name="search_result_item_image_margin_start">24dp</dimen>

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



    <dimen name="search_bar_height">64dp</dimen>



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

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

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

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ 
    <dimen name="search_bar_margin">8dp</dimen>

    <dimen name="search_bar_negative_margin">-8dp</dimen>



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

    <dimen name="search_bar_text_size">16dp</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

+4 −0
Original line number Diff line number Diff line
@@ -458,4 +458,8 @@ 
        <item name="android:background">@color/material_grey_300</item>

    </style>



    <style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">

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

    </style>



</resources>