[SearchView] do not translate toolbar buttons after predictive back gesture

This change fixes an issue where toolbar buttons like the back button and action menu buttons get misplaced after a predictive back gesture. This is due to a translation animation not being reset. This animation is actually not needed for the contained animation because the toolbar containing the buttons are animating in size, so the buttons are aligned already. So this change fixes the issue by removing the buttons translation animation for contained style.

PiperOrigin-RevId: 878567283

Author: Material Design Team

lib/java/com/google/android/material/search/SearchViewAnimationHelper.java

@@ -412,34 +412,6 @@ private AnimatorSet getButtonsProgressAnimator(boolean show) {
     return animatorSet;
   }
 
-  private AnimatorSet getButtonsTranslationAnimator(boolean show) {
-    AnimatorSet animatorSet = new AnimatorSet();
-    addBackButtonTranslationAnimatorIfNeeded(animatorSet);
-    addActionMenuViewAnimatorIfNeeded(animatorSet);
-    animatorSet.setDuration(show ? SHOW_DURATION_MS : HIDE_DURATION_MS);
-    animatorSet.setInterpolator(
-        ReversableAnimatedValueInterpolator.of(show, AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR));
-    return animatorSet;
-  }
-
-  private void addBackButtonTranslationAnimatorIfNeeded(AnimatorSet animatorSet) {
-    ImageButton searchViewBackButton = ToolbarUtils.getNavigationIconButton(toolbar);
-    if (searchViewBackButton == null) {
-      return;
-    }
-    ImageButton searchBarBackButton = ToolbarUtils.getNavigationIconButton(searchBar);
-
-    ValueAnimator backButtonAnimatorX =
-        ValueAnimator.ofFloat(
-            getTranslationXBetweenViews(searchBarBackButton, searchViewBackButton), 0);
-    backButtonAnimatorX.addUpdateListener(MultiViewUpdateListener.translationXListener(searchViewBackButton));
-
-    ValueAnimator backButtonAnimatorY = ValueAnimator.ofFloat(getFromTranslationY(), 0);
-    backButtonAnimatorY.addUpdateListener(MultiViewUpdateListener.translationYListener(searchViewBackButton));
-
-    animatorSet.playTogether(backButtonAnimatorX, backButtonAnimatorY);
-  }
-
   private void addBackButtonProgressAnimatorIfNeeded(AnimatorSet animatorSet) {
     ImageButton backButton = ToolbarUtils.getNavigationIconButton(toolbar);
     if (backButton == null) {
@@ -498,26 +470,6 @@ private void setFullDrawableProgressIfNeeded(Drawable drawable) {
     }
   }
 
-  private void addActionMenuViewAnimatorIfNeeded(AnimatorSet animatorSet) {
-    ActionMenuView searchViewActionMenuView = ToolbarUtils.getActionMenuView(toolbar);
-    if (searchViewActionMenuView == null) {
-      return;
-    }
-    ActionMenuView searchBarActionMenuView = ToolbarUtils.getActionMenuView(searchBar);
-
-    ValueAnimator actionMenuViewAnimatorX =
-        ValueAnimator.ofFloat(
-            getTranslationXBetweenViews(searchBarActionMenuView, searchViewActionMenuView), 0);
-    actionMenuViewAnimatorX.addUpdateListener(
-        MultiViewUpdateListener.translationXListener(searchViewActionMenuView));
-
-    ValueAnimator actionMenuViewAnimatorY = ValueAnimator.ofFloat(getFromTranslationY(), 0);
-    actionMenuViewAnimatorY.addUpdateListener(
-        MultiViewUpdateListener.translationYListener(searchViewActionMenuView));
-
-    animatorSet.playTogether(actionMenuViewAnimatorX, actionMenuViewAnimatorY);
-  }
-
   private void setMenuItemsNotClickable(Toolbar toolbar) {
     ActionMenuView actionMenuView = ToolbarUtils.getActionMenuView(toolbar);
     if (actionMenuView != null) {
@@ -576,7 +528,7 @@ public void finishBackProgress() {
     backHelper.finishBackProgress(totalDuration, searchBar);
 
     if (backProgressAnimatorSet != null) {
-      getButtonsTranslationAnimator(/* show= */ false).start();
+      animationDelegate.startButtonsTranslationAnimation();
       backProgressAnimatorSet.resume();
     }
 
@@ -621,12 +573,6 @@ private void setActionMenuViewAlphaIfNeeded(float alpha) {
     }
   }
 
-  private int getFromTranslationY() {
-    int toolbarMiddleY = toolbarContainer.getTop() + toolbarContainer.getHeight() / 2;
-    int searchBarMiddleY = getViewTopFromSearchViewParent(searchBar) + searchBar.getHeight() / 2;
-    return searchBarMiddleY - toolbarMiddleY;
-  }
-
   private int getTranslationXBetweenViews(
       @Nullable View searchBarSubView, @NonNull View searchViewSubView) {
     // If there is no equivalent for the SearchView subview in the SearchBar, we return the
@@ -713,6 +659,11 @@ public void onAnimationStart(boolean show) {}
     @Override
     public void onAnimationEnd(boolean show) {}
 
+    @Override
+    public void startButtonsTranslationAnimation() {
+      getButtonsTranslationAnimator(/* show= */ false).start();
+    }
+
     private Animator getScrimAlphaAnimator(boolean show) {
       TimeInterpolator interpolator =
           show ? AnimationUtils.LINEAR_INTERPOLATOR : AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR;
@@ -948,6 +899,57 @@ private int getFromTranslationY() {
       int searchBarMiddleY = getViewTopFromSearchViewParent(searchBar) + searchBar.getHeight() / 2;
       return searchBarMiddleY - toolbarMiddleY;
     }
+
+    private AnimatorSet getButtonsTranslationAnimator(boolean show) {
+      AnimatorSet animatorSet = new AnimatorSet();
+      addBackButtonTranslationAnimatorIfNeeded(animatorSet);
+      addActionMenuViewAnimatorIfNeeded(animatorSet);
+      animatorSet.setDuration(show ? SHOW_DURATION_MS : HIDE_DURATION_MS);
+      animatorSet.setInterpolator(
+          ReversableAnimatedValueInterpolator.of(
+              show, AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR));
+      return animatorSet;
+    }
+
+    private void addBackButtonTranslationAnimatorIfNeeded(AnimatorSet animatorSet) {
+      ImageButton searchViewBackButton = ToolbarUtils.getNavigationIconButton(toolbar);
+      if (searchViewBackButton == null) {
+        return;
+      }
+      ImageButton searchBarBackButton = ToolbarUtils.getNavigationIconButton(searchBar);
+
+      ValueAnimator backButtonAnimatorX =
+          ValueAnimator.ofFloat(
+              getTranslationXBetweenViews(searchBarBackButton, searchViewBackButton), 0);
+      backButtonAnimatorX.addUpdateListener(
+          MultiViewUpdateListener.translationXListener(searchViewBackButton));
+
+      ValueAnimator backButtonAnimatorY = ValueAnimator.ofFloat(getFromTranslationY(), 0);
+      backButtonAnimatorY.addUpdateListener(
+          MultiViewUpdateListener.translationYListener(searchViewBackButton));
+
+      animatorSet.playTogether(backButtonAnimatorX, backButtonAnimatorY);
+    }
+
+    private void addActionMenuViewAnimatorIfNeeded(AnimatorSet animatorSet) {
+      ActionMenuView searchViewActionMenuView = ToolbarUtils.getActionMenuView(toolbar);
+      if (searchViewActionMenuView == null) {
+        return;
+      }
+      ActionMenuView searchBarActionMenuView = ToolbarUtils.getActionMenuView(searchBar);
+
+      ValueAnimator actionMenuViewAnimatorX =
+          ValueAnimator.ofFloat(
+              getTranslationXBetweenViews(searchBarActionMenuView, searchViewActionMenuView), 0);
+      actionMenuViewAnimatorX.addUpdateListener(
+          MultiViewUpdateListener.translationXListener(searchViewActionMenuView));
+
+      ValueAnimator actionMenuViewAnimatorY = ValueAnimator.ofFloat(getFromTranslationY(), 0);
+      actionMenuViewAnimatorY.addUpdateListener(
+          MultiViewUpdateListener.translationYListener(searchViewActionMenuView));
+
+      animatorSet.playTogether(actionMenuViewAnimatorX, actionMenuViewAnimatorY);
+    }
   }
 
   private class ContainedAnimationDelegate implements AnimationDelegate {
@@ -1035,6 +1037,12 @@ public void onAnimationEnd(boolean show) {
       setWidth(dummyTextView, LayoutParams.WRAP_CONTENT);
     }
 
+    @Override
+    public void startButtonsTranslationAnimation() {
+      // No necessary for contained animation as the toolbar contained the buttons is animating
+      // to match the size of search bar.
+    }
+
     /**
      * Returns an {@link Animator} that fades in or out the background, based on the value of {@code
      * show}.
@@ -1286,5 +1294,11 @@ private interface AnimationDelegate {
     void onAnimationStart(boolean show);
 
     void onAnimationEnd(boolean show);
+
+    /**
+     * Starts to translate the toolbar buttons like back button and action menu buttons from search
+     * view to search bar.
+     */
+    void startButtonsTranslationAnimation();
   }
 }