From 392acf98c36041b381455e2889477e136a5a19f0 Mon Sep 17 00:00:00 2001
From: manabu-nakamura <ma.nakamura@gmail.com>
Date: Thu, 7 Dec 2023 16:15:27 +0000
Subject: [PATCH] [Catalog][Search] search bar scrolls away with content

Resolves https://github.com/material-components/material-components-android/pull/3875

This is one step towards resolving https://github.com/material-components/material-components-android/issues/3103. There's still a thin grey line from the search bar underneath the status bar when it scrolls up, but it's a big improvement from before, where the search bar entirely overlapped with the status bar when scrolling.

GIT_ORIGIN_REV_ID=c65c225a1f66db798084d753fc497a1865cafe7a
PiperOrigin-RevId: 588797889
---
 .../catalog/search/res/layout/cat_search_fragment.xml    | 6 ++++--
 .../search/res/layout/cat_search_recycler_fragment.xml   | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/catalog/java/io/material/catalog/search/res/layout/cat_search_fragment.xml b/catalog/java/io/material/catalog/search/res/layout/cat_search_fragment.xml
index f6c7a9d2dcb..312c8923c52 100644
--- a/catalog/java/io/material/catalog/search/res/layout/cat_search_fragment.xml
+++ b/catalog/java/io/material/catalog/search/res/layout/cat_search_fragment.xml
@@ -40,13 +40,15 @@
       android:id="@+id/app_bar_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:fitsSystemWindows="true">
+      android:fitsSystemWindows="true"
+      app:liftOnScroll="false">
 
     <com.google.android.material.search.SearchBar
         android:id="@+id/cat_search_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/cat_searchbar_hint">
+        android:hint="@string/cat_searchbar_hint"
+        app:layout_scrollEffect="compress">
     </com.google.android.material.search.SearchBar>
   </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/catalog/java/io/material/catalog/search/res/layout/cat_search_recycler_fragment.xml b/catalog/java/io/material/catalog/search/res/layout/cat_search_recycler_fragment.xml
index 9aa082ee4cd..a104e4ae379 100644
--- a/catalog/java/io/material/catalog/search/res/layout/cat_search_recycler_fragment.xml
+++ b/catalog/java/io/material/catalog/search/res/layout/cat_search_recycler_fragment.xml
@@ -37,19 +37,20 @@
       android:id="@+id/app_bar_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:fitsSystemWindows="true">
+      android:fitsSystemWindows="true"
+      app:liftOnScroll="false">
 
     <com.google.android.material.search.SearchBar
         android:id="@+id/open_search_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/cat_searchbar_hint">
+        android:hint="@string/cat_searchbar_hint"
+        app:layout_scrollEffect="compress">
     </com.google.android.material.search.SearchBar>
 
     <com.google.android.material.tabs.TabLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent">
+        android:layout_height="wrap_content">
 
       <com.google.android.material.tabs.TabItem
           android:text="@string/cat_searchbar_tabs_label_explore"