[Searchbar] Fix centering text when set by the search view

PiperOrigin-RevId: 735817759

Author: imhappi

catalog/java/io/material/catalog/search/SearchDemoUtils.java

@@ -184,7 +184,7 @@ private static List<SuggestionItem> getThisWeekSuggestions() {
 
   private static void submitSearchQuery(SearchBar searchBar, SearchView searchView, String query) {
     searchBar.setText(query);
-    searchView.hide();
+    searchBar.post(() -> searchView.hide());
   }
 
   private static class SuggestionItem {

catalog/java/io/material/catalog/search/res/layout/cat_search_appbar_icons_fragment.xml

@@ -18,8 +18,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:fitsSystemWindows="true">
+  android:layout_height="match_parent">
 
   <com.google.android.material.appbar.AppBarLayout
     android:id="@+id/app_bar_layout"
@@ -76,6 +75,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
+      android:fitsSystemWindows="true"
       android:lineSpacingMultiplier="1.2"
       android:text="@string/cat_searchbar_lorem_ipsum"/>
   </androidx.core.widget.NestedScrollView>

catalog/java/io/material/catalog/search/res/layout/cat_search_fragment.xml

@@ -18,7 +18,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+  android:fitsSystemWindows="true">
 
   <androidx.core.widget.NestedScrollView
       android:id="@+id/nested_scroll_view"

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

@@ -608,8 +608,10 @@ public void setTextCentered(boolean textCentered) {
     }
     Toolbar.LayoutParams lp = (LayoutParams) textView.getLayoutParams();
     if (textCentered) {
+      textView.setGravity(Gravity.CENTER_HORIZONTAL);
       lp.gravity = Gravity.CENTER_HORIZONTAL;
     } else {
+      textView.setGravity(Gravity.NO_GRAVITY);
       lp.gravity = Gravity.NO_GRAVITY;
     }
     textView.setLayoutParams(lp);

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

@@ -30,6 +30,7 @@
 import androidx.appcompat.graphics.drawable.DrawerArrowDrawable;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.Toolbar;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
@@ -550,8 +551,22 @@ private Animator getEditTextAnimator(boolean show) {
   }
 
   private Animator getTranslationAnimatorForText(boolean show, View v) {
+    TextView textView = searchBar.getTextView();
+    int additionalMovement = 0;
+    // If the text is centered and the text's hint is not equal to the text (ie. if there's any
+    // extra space in between the textview's start and the actual text bounds)
+    if (!TextUtils.isEmpty(textView.getText())
+        && searchBar.getTextCentered()
+        && textView.getHint() != textView.getText()) {
+      String text = textView.getText().toString();
+      Rect bounds = new Rect();
+
+      textView.getPaint().getTextBounds(text, 0, text.length(), bounds);
+      additionalMovement = max(0, searchBar.getTextView().getMeasuredWidth() / 2 - bounds.width() / 2);
+    }
     int startX =
         searchBar.getTextView().getLeft()
+            + additionalMovement
             + searchBar.getLeft()
             - (v.getLeft() + textContainer.getLeft());
     return getTranslationAnimator(show, v, startX, getFromTranslationY());