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

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

Merge "Settings homepage redesign" into sc-dev

parents 11ad3be0 c37dd712

res/drawable/ic_homepage_search.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorAccent">

        android:tint="?android:attr/textColorSecondary">

    <path

        android:fillColor="#FF000000"

        android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>

res/layout/search_bar.xml

+3 −11
Original line number Diff line number Diff line
@@ -19,10 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/search_bar_margin"

    android:layout_marginStart="@dimen/search_bar_margin"

    android:layout_marginEnd="@dimen/search_bar_margin"

    android:layout_marginBottom="@dimen/search_bar_margin_bottom">

    android:layout_margin="@dimen/search_bar_margin">



    <com.google.android.material.card.MaterialCardView

        android:id="@+id/search_bar"
@@ -34,7 +31,7 @@ 
            android:id="@+id/search_action_bar"

            android:layout_width="match_parent"

            android:layout_height="@dimen/search_bar_height"

            android:layout_marginStart="-2dp"

            android:paddingStart="4dp"

            android:background="@drawable/search_bar_selected_background"

            android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"

            android:navigationIcon="@drawable/ic_homepage_search">
@@ -43,16 +40,11 @@ 
                style="@style/TextAppearance.SearchBar"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingStart="-4dp"

                android:layout_gravity="start"

                android:text="@string/search_menu"/>

        </Toolbar>

    </com.google.android.material.card.MaterialCardView>



   <ImageView

        android:id="@+id/account_avatar"

        android:layout_width="@dimen/avatar_length"

        android:layout_height="@dimen/avatar_length"

        android:layout_gravity="center_vertical"

        android:contentDescription="@string/search_bar_account_avatar_content_description"/>

</LinearLayout>

res/layout/settings_homepage_container.xml

+19 −27
Original line number Diff line number Diff line
@@ -65,34 +65,26 @@ 
            android:orientation="vertical"

            app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">



            <LinearLayout

                android:id="@+id/contextual_suggestion_content"

                android:layout_width="match_parent"

                android:layout_height="@dimen/suggestion_height"

                android:paddingHorizontal="@dimen/suggestion_padding_horizontal"

                android:paddingVertical="@dimen/suggestion_padding_vertical"

                android:orientation="vertical"

                android:gravity="bottom"

                android:visibility="gone">

            <ImageView

                android:id="@+id/account_avatar"

                android:layout_width="@dimen/avatar_length"

                android:layout_height="@dimen/avatar_length"

                android:layout_marginTop="@dimen/avatar_margin_top"

                android:layout_marginEnd="@dimen/avatar_margin_end"

                android:layout_gravity="end"

                android:visibility="invisible"

                android:accessibilityTraversalAfter="@id/homepage_title"

                android:contentDescription="@string/search_bar_account_avatar_content_description"/>



            <TextView

                    android:id="@+id/suggestion_title"

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1"

                android:id="@+id/homepage_title"

                android:text="@string/settings_label"

                    style="@style/ContextualSuggestionText"/>

                style="@style/HomepageTitleText"/>



                <Button

                    android:id="@+id/suggestion_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/suggestion_button_margin_top"

                    android:paddingHorizontal="@dimen/suggestion_button_padding_horizontal"

                    android:visibility="gone"

                    style="@style/ActionPrimaryButton"/>



            </LinearLayout>

            <FrameLayout

                android:id="@+id/suggestion_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>



            <include layout="@layout/search_bar"/>

res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <color name="homepage_support_background">#3F5FBD</color>

    <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>

    <color name="contextual_card_background">@*android:color/material_grey_900</color>

    <color name="search_bar_background">@*android:color/material_grey_800</color>

    <color name="search_bar_background">@*android:color/material_grey_900</color>

    <!-- Dialog background color. -->

    <color name="dialog_background">@*android:color/material_grey_800</color>

    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>

res/values/dimens.xml

+15 −19
Original line number Diff line number Diff line
@@ -131,25 +131,21 @@ 
    <dimen name="switchbar_subsettings_margin_start">72dp</dimen>

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



    <!-- Search bar and avatar -->

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

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

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

    <dimen name="search_bar_text_size">16sp</dimen>

    <dimen name="search_bar_card_elevation">2dp</dimen>

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

    <dimen name="avatar_length">@dimen/search_bar_height</dimen>



    <!-- Contextual suggestions -->

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

    <dimen name="suggestion_padding_horizontal">24dp</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>

    <!-- Search bar -->

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

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

    <dimen name="search_bar_text_size">20sp</dimen>

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

    <dimen name="search_bar_content_inset">56dp</dimen>



    <!-- Avatar -->

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

    <dimen name="avatar_margin_top">56dp</dimen>

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



    <!-- Homepage title -->

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

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



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

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