From 9243b8ca56e7c1969d01cce343715ddb95575a56 Mon Sep 17 00:00:00 2001 From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:39:44 +0800 Subject: [PATCH] Tweak search bar style to follow Launcher3 --- .../res/layout/search_container_all_apps.xml | 16 ++++++++++++++-- .../app/lawnchair/allapps/AllAppsSearchInput.kt | 7 +++++++ res/drawable/ic_allapps_search.xml | 5 +++-- .../allapps/ActivityAllAppsContainerView.java | 7 +++---- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lawnchair/res/layout/search_container_all_apps.xml b/lawnchair/res/layout/search_container_all_apps.xml index 6965d9ec85..7ea5ae5e2d 100644 --- a/lawnchair/res/layout/search_container_all_apps.xml +++ b/lawnchair/res/layout/search_container_all_apps.xml @@ -21,7 +21,6 @@ android:layout_height="@dimen/search_box_container_height" android:clickable="true" android:focusable="true"> - - + + if (!hasFocus) { diff --git a/res/drawable/ic_allapps_search.xml b/res/drawable/ic_allapps_search.xml index e6263924be..1a6fc69adc 100644 --- a/res/drawable/ic_allapps_search.xml +++ b/res/drawable/ic_allapps_search.xml @@ -18,8 +18,9 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" - android:autoMirrored="true"> + android:autoMirrored="true" + android:tint="?android:attr/textColorPrimary"> diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index 44b389d1e7..830709b79d 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -777,14 +777,13 @@ public class ActivityAllAppsContainerView return; } - float prog = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f); boolean bgVisible = mSearchUiManager.getBackgroundVisibility(); - if (scrolledOffset == 0 && !isSearching()) { + if (!isSearching()) { bgVisible = true; - } else if (scrolledOffset > mHeaderThreshold) { + } else { bgVisible = false; } - mSearchUiManager.setBackgroundVisibility(bgVisible, 1 - prog); + mSearchUiManager.setBackgroundVisibility(bgVisible, 1); } protected int getHeaderColor(float blendRatio) {