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

Commit ea5e44f1 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge changes I53ea81ce,I84505033,I4bd5c343 into main 

* changes:
  Apply round corner group background for large screen
  Update suggestion card padding in Homepage
  Update Search Bar layout in Homepage
parents 3c32c3e2 542cd442

res/drawable/homepage_highlighted_item_background_v2.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->

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

        android:color="@*android:color/ripple_material_light">

    <item

        android:left="?android:attr/listPreferredItemPaddingStart"

        android:right="?android:attr/listPreferredItemPaddingEnd">

        <shape android:shape="rectangle">

            <solid

                android:color="@color/settingslib_materialColorPrimaryContainer" />

            <corners

                android:radius="?android:attr/dialogCornerRadius" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file

res/drawable/homepage_selectable_item_background_v2.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->

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

        android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask"

        android:left="?android:attr/listPreferredItemPaddingStart"

        android:right="?android:attr/listPreferredItemPaddingEnd">

        <shape android:shape="rectangle">

            <solid

                android:color="@android:color/white" />

            <corners

                android:radius="?android:attr/dialogCornerRadius" />

        </shape>

    </item>

</ripple>

res/layout/search_bar_unified_version.xml

+21 −15
Original line number Diff line number Diff line
@@ -17,28 +17,34 @@ 


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

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

    style="@style/SearchBarStyle"

    android:layout_width="0dp"

    android:layout_height="wrap_content"

    android:layout_weight="1">

    <Toolbar

        android:id="@+id/search_action_bar_unified"

    style="@style/SearchBarStyle_v2"

    android:layout_width="match_parent"

        android:layout_height="@dimen/search_bar_height"

        android:paddingStart="8dp"

    android:layout_height="wrap_content">



    <LinearLayout

        android:id="@+id/search_action_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="72dp"

        android:gravity="center_vertical"

        android:orientation="horizontal"

        android:paddingStart="24dp"

        android:paddingEnd="24dp"

        android:background="@drawable/search_bar_selected_background"

        android:touchscreenBlocksFocus="false"

        android:nextFocusForward="@+id/homepage_container"

        android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"

        android:navigationIcon="@drawable/ic_homepage_search">

        android:background="@drawable/search_bar_selected_background">



        <ImageView

            android:id="@+id/imageView"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:importantForAccessibility="no"

            android:src="@drawable/ic_homepage_search" />

        <TextView

            android:id="@+id/search_bar_title"

            style="@style/TextAppearance.SearchBar"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="8dp"

            android:layout_gravity="start"

            android:paddingEnd="8dp"

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

    </Toolbar>

    </LinearLayout>

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

res/layout/settings_homepage_app_bar_unified_layout.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<LinearLayout

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

    android:id="@+id/app_bar_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginHorizontal="16dp"

    android:padding="6dp"

    android:orientation="horizontal">



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



</LinearLayout>

res/layout/settings_homepage_container_v2.xml

+8 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
                android:id="@+id/suggestion_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="10dp"

                android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"

                android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd" />
@@ -62,19 +61,21 @@ 
        android:id="@+id/app_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        app:elevation="0dp"

        android:touchscreenBlocksFocus="false"

        android:keyboardNavigationCluster="false">

        <LinearLayout

            android:id="@+id/app_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:minHeight="76dp"

            app:layout_scrollFlags="scroll|exitUntilCollapsed">

            android:orientation="horizontal"

            android:paddingTop="8dp"

            android:paddingBottom="24dp"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



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



            <include

                android:id="@+id/homepage_app_bar_unified_view"

                layout="@layout/settings_homepage_app_bar_unified_layout"/>

        </LinearLayout>

    </com.google.android.material.appbar.AppBarLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>