From 66c16d57af59d5541725f9560f9eceb04db79fd1 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Thu, 16 May 2024 12:06:59 +0000
Subject: [PATCH] Update Search Bar layout in Homepage

Bug: 340513864
Bug: 340773713
Bug: 340799397
Bug: 340759836
Test: visual
Change-Id: I4bd5c3438aa55ca764f61b180a37c10206ee78be
---
 res/layout/search_bar_unified_version.xml     | 36 +++++++++++--------
 ...ttings_homepage_app_bar_unified_layout.xml | 29 ---------------
 res/layout/settings_homepage_container_v2.xml | 14 ++++----
 res/values/styles.xml                         |  7 ++++
 res/values/themes.xml                         |  1 +
 .../homepage/SettingsHomepageActivity.java    |  6 +++-
 .../search/SearchFeatureProvider.java         | 18 ++++++----
 7 files changed, 53 insertions(+), 58 deletions(-)
 delete mode 100644 res/layout/settings_homepage_app_bar_unified_layout.xml

diff --git a/res/layout/search_bar_unified_version.xml b/res/layout/search_bar_unified_version.xml
index eec8406af7d..a8ad6fc4033 100644
--- a/res/layout/search_bar_unified_version.xml
+++ b/res/layout/search_bar_unified_version.xml
@@ -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="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/search_action_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/search_bar_height"
-        android:paddingStart="8dp"
+        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>
diff --git a/res/layout/settings_homepage_app_bar_unified_layout.xml b/res/layout/settings_homepage_app_bar_unified_layout.xml
deleted file mode 100644
index 3e254186822..00000000000
--- a/res/layout/settings_homepage_app_bar_unified_layout.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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>
diff --git a/res/layout/settings_homepage_container_v2.xml b/res/layout/settings_homepage_container_v2.xml
index 55fb1dac57f..c3ac1ab107d 100644
--- a/res/layout/settings_homepage_container_v2.xml
+++ b/res/layout/settings_homepage_container_v2.xml
@@ -62,19 +62,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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f7d7a9043b1..54e2fa2b496 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -459,6 +459,13 @@
         <item name="cardElevation">0dp</item>
     </style>
 
+    <style name="SearchBarStyle_v2">
+        <item name="cardCornerRadius">40dp</item>
+        <item name="cardElevation">0dp</item>
+        <item name="strokeWidth">1dp</item>
+        <item name="strokeColor">@color/settingslib_materialColorOutlineVariant</item>
+    </style>
+
     <style name="ConditionCardBorderlessButton"
            parent="android:Widget.DeviceDefault.Button.Borderless">
         <item name="android:textColor">?android:attr/colorAccent</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 182dd694318..e91ca491213 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -185,6 +185,7 @@
     <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
         <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
         <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:listPreferredItemPaddingStart">16dp</item>
         <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
 
         <!-- action bar, needed for search bar icon tinting -->
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index e422ce956ce..8a84e47b364 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -406,7 +406,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
 
     private void initSearchBarView() {
         if (Flags.homepageRevamp()) {
-            Toolbar toolbar = findViewById(R.id.search_action_bar_unified);
+            View toolbar = findViewById(R.id.search_action_bar);
             FeatureFactory.getFeatureFactory().getSearchFeatureProvider()
                     .initSearchToolbar(this /* activity */, toolbar,
                             SettingsEnums.SETTINGS_HOMEPAGE);
@@ -469,6 +469,10 @@ public class SettingsHomepageActivity extends FragmentActivity implements
         window.setStatusBarColor(color);
         // Update content background.
         findViewById(android.R.id.content).setBackgroundColor(color);
+        if (Flags.homepageRevamp()) {
+            //Update search bar background
+            findViewById(R.id.app_bar_container).setBackgroundColor(color);
+        }
     }
 
     private void showSuggestionFragment(boolean scrollNeeded) {
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 5707bc28f79..ab046893d41 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -30,6 +30,7 @@ import android.view.ViewGroup;
 import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
@@ -80,8 +81,9 @@ public interface SearchFeatureProvider {
     /**
      * Initializes the search toolbar.
      */
-    default void initSearchToolbar(FragmentActivity activity, Toolbar toolbar, int pageId) {
-        if (activity == null || toolbar == null) {
+    default void initSearchToolbar(@NonNull FragmentActivity activity, @Nullable View toolbar,
+            int pageId) {
+        if (toolbar == null) {
             return;
         }
 
@@ -98,11 +100,13 @@ public interface SearchFeatureProvider {
         //
         // Need to make the navigation icon non-clickable so that the entire card is clickable
         // and goes to the search UI. Also set the background to null so there's no ripple.
-        final View navView = toolbar.getNavigationView();
-        navView.setClickable(false);
-        navView.setFocusable(false);
-        navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
-        navView.setBackground(null);
+        if (toolbar instanceof Toolbar) {
+            final View navView = ((Toolbar) toolbar).getNavigationView();
+            navView.setClickable(false);
+            navView.setFocusable(false);
+            navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+            navView.setBackground(null);
+        }
 
         final Context context = activity.getApplicationContext();
         final Intent intent = buildSearchIntent(context, pageId)