From f7ce5a06fe2ddbbcadda251f424d0267817f38e7 Mon Sep 17 00:00:00 2001 From: Kevin Lim Date: Mon, 19 May 2025 13:17:59 -0700 Subject: [PATCH] [Multiline] Clean-up multiline flag on Launcher3 Bug: b/409605328 Flag: EXEMPT removing multiline_search_bar Test: Unit tests all passing Change-Id: Id377b7c99af0d0265102888b8021c0809f53a6b9 --- aconfig/launcher.aconfig | 7 ------- .../allapps/ActivityAllAppsContainerView.java | 4 +--- .../launcher3/allapps/FloatingHeaderView.java | 7 +------ .../launcher3/allapps/FloatingHeaderViewTest.kt | 16 +--------------- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index c49233bcd5..c3019d1d7d 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -251,13 +251,6 @@ flag { bug: "400827727" } -flag { - name: "multiline_search_bar" - namespace: "launcher" - description: "Search bar can wrap to multi-line" - bug: "341795751" -} - flag { name: "enable_multi_instance_menu_taskbar" namespace: "launcher" diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index e79dd2e60a..00054591dd 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -779,9 +779,7 @@ public class ActivityAllAppsContainerView * request {@link FloatingHeaderView} to update its maxTranslation for multiline search bar. */ public void forceUpdateHeaderHeight(int offset) { - if (Flags.multilineSearchBar()) { - mHeader.updateSearchBarOffset(offset); - } + mHeader.updateSearchBarOffset(offset); } @Override diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index 896a4e1073..ff03d58d5a 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java @@ -275,15 +275,10 @@ public class FloatingHeaderView extends LinearLayout implements mTabLayout.setVisibility(mTabsHidden ? GONE : visibility); } - /** Returns whether search bar has multi-line support, and is currently in multi-line state. */ - private boolean isSearchBarMultiline() { - return Flags.multilineSearchBar() && mSearchBarOffset > 0; - } - private void updateExpectedHeight() { updateFloatingRowsHeight(); mMaxTranslation = 0; - boolean shouldAddSearchBarHeight = isSearchBarMultiline() && !Flags.floatingSearchBar(); + boolean shouldAddSearchBarHeight = mSearchBarOffset > 0 && !Flags.floatingSearchBar(); if (shouldAddSearchBarHeight) { mMaxTranslation += mSearchBarOffset; } diff --git a/tests/multivalentTests/src/com/android/launcher3/allapps/FloatingHeaderViewTest.kt b/tests/multivalentTests/src/com/android/launcher3/allapps/FloatingHeaderViewTest.kt index d2103aeeac..0cf631ef4c 100644 --- a/tests/multivalentTests/src/com/android/launcher3/allapps/FloatingHeaderViewTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/allapps/FloatingHeaderViewTest.kt @@ -48,19 +48,6 @@ class FloatingHeaderViewTest { } @Test - @DisableFlags(Flags.FLAG_FLOATING_SEARCH_BAR, Flags.FLAG_MULTILINE_SEARCH_BAR) - fun onHeightUpdated_whenNotMultiline_thenZeroHeight() { - vut.setFloatingRowsCollapsed(true) - val beforeHeight = vut.maxTranslation - vut.updateSearchBarOffset(HEADER_HEIGHT_OFFSET) - - vut.onHeightUpdated() - - assertThat(vut.maxTranslation).isEqualTo(beforeHeight) - } - - @Test - @EnableFlags(Flags.FLAG_MULTILINE_SEARCH_BAR) @DisableFlags(Flags.FLAG_FLOATING_SEARCH_BAR) fun onHeightUpdated_whenMultiline_thenHeightIsOffset() { vut.setFloatingRowsCollapsed(true) @@ -72,9 +59,8 @@ class FloatingHeaderViewTest { } @Test - @DisableFlags(Flags.FLAG_MULTILINE_SEARCH_BAR) @EnableFlags(Flags.FLAG_FLOATING_SEARCH_BAR) - fun onHeightUpdated_whenFloatingRowsShownAndNotMultiline_thenAddsOnlyFloatingRow() { + fun onHeightUpdated_whenFloatingRowsShownAndSingleLine_thenAddsOnlyFloatingRow() { // Collapse floating rows and expand to trigger header height calculation vut.setFloatingRowsCollapsed(true) vut.setFloatingRowsCollapsed(false)