Merge "[Multiline] Clean-up multiline flag on Launcher3" into main

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"

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

@@ -779,9 +779,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
      * 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

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;
         }

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)