Merge "Make homepage search bar remain persistent when scrolling" into tm-dev am: c0c6944e95

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033477

Change-Id: I85fe91d08983dfb15a571fc0aae69607e886c8e7
This commit is contained in:
Tsung-Mao Fang
2022-03-01 08:55:13 +00:00
committed by Automerger Merge Worker
3 changed files with 5 additions and 2 deletions

View File

@@ -19,6 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/colorBackground"
android:orientation="vertical">
<ImageView

View File

@@ -17,8 +17,11 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:background="?androidprv:attr/colorSurface"
android:orientation="vertical">
<FrameLayout
@@ -29,7 +32,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:orientation="horizontal">
<include layout="@layout/search_bar_two_pane_version"/>

View File

@@ -61,7 +61,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<include
android:id="@+id/homepage_app_bar_regular_phone_view"