[Catalog] A11y fixes for floating and docked toolbar

PiperOrigin-RevId: 733788219

Author: imhappi

catalog/java/io/material/catalog/dockedtoolbar/DockedToolbarMainDemoFragment.java

@@ -34,6 +34,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior;
 import com.google.android.material.dockedtoolbar.DockedToolbarLayout;
 import com.google.android.material.snackbar.Snackbar;
 import io.material.catalog.feature.DemoFragment;
@@ -42,6 +43,7 @@
 public class DockedToolbarMainDemoFragment extends DemoFragment {
 
   private DockedToolbarLayout dockedToolbar;
+  @Nullable private Behavior<View> behavior;
 
   @NonNull
   @Override
@@ -53,6 +55,9 @@ public View onCreateDemoView(
     View view = layoutInflater.inflate(getLayoutResId(), viewGroup, /* attachToRoot= */ false);
     Toolbar toolbar = view.findViewById(R.id.toolbar);
     dockedToolbar = view.findViewById(R.id.docked_toolbar);
+    behavior =
+        (CoordinatorLayout.Behavior<View>)
+            ((CoordinatorLayout.LayoutParams) dockedToolbar.getLayoutParams()).getBehavior();
     ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
 
     Button leftArrowButton = view.findViewById(R.id.docked_toolbar_left_arrow_button);
@@ -72,16 +77,28 @@ public View onCreateDemoView(
 
     if (VERSION.SDK_INT >= VERSION_CODES.M) {
       AccessibilityManager am = getContext().getSystemService(AccessibilityManager.class);
-      if (am != null && am.isTouchExplorationEnabled()) {
-        ((CoordinatorLayout.LayoutParams) dockedToolbar.getLayoutParams()).setBehavior(null);
-        dockedToolbar.post(
-            () -> bodyContainer.setPadding(0, 0, 0, dockedToolbar.getMeasuredHeight()));
+      if (am != null) {
+        am.addTouchExplorationStateChangeListener(enabled -> updateScrollBehaviorWithTalkback(bodyContainer, enabled));
+        if (am.isTouchExplorationEnabled()) {
+          updateScrollBehaviorWithTalkback(bodyContainer, /* talkbackEnabled= */ true);
+        }
       }
     }
 
     return view;
   }
 
+  private void updateScrollBehaviorWithTalkback(View content, boolean talkbackEnabled) {
+    ((CoordinatorLayout.LayoutParams) dockedToolbar.getLayoutParams()).setBehavior(talkbackEnabled ? null : behavior);
+    dockedToolbar.post(
+        () ->
+            content.setPadding(
+                /* left= */ 0,
+                /* top= */ 0,
+                /* right= */ 0,
+                talkbackEnabled ? dockedToolbar.getMeasuredHeight() : 0));
+  }
+
   private void showMenu(View v, @MenuRes int menuRes) {
     PopupMenu popup = new PopupMenu(getContext(), v);
     // Inflating the Popup using xml file

catalog/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_fragment.xml

@@ -50,7 +50,6 @@
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
       android:lineSpacingMultiplier="1.2"
-      android:accessibilityTraversalAfter="@id/docked_toolbar"
       android:text="@string/cat_docked_toolbar_filler_text" />
 
   </LinearLayout>
@@ -61,7 +60,6 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_gravity="bottom"
-  android:accessibilityTraversalBefore="@id/body_text"
   app:layout_behavior="com.google.android.material.behavior.HideViewOnScrollBehavior">
 
   <LinearLayout

catalog/java/io/material/catalog/floatingtoolbar/FloatingToolbarMainDemoFragment.java

@@ -20,18 +20,23 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.behavior.HideViewOnScrollBehavior;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingtoolbar.FloatingToolbarLayout;
 import io.material.catalog.feature.DemoFragment;
@@ -145,9 +150,27 @@ public View onCreateDemoView(
     // Select bottom configuration button to represent the toolbar that's initially visible.
     view.findViewById(R.id.bottom_button).performClick();
 
+    if (VERSION.SDK_INT >= VERSION_CODES.M) {
+      AccessibilityManager am = getContext().getSystemService(AccessibilityManager.class);
+      if (am != null) {
+        am.addTouchExplorationStateChangeListener(enabled -> updateScrollBehaviorOnTalkback(floatingToolbars, enabled));
+        if (am.isTouchExplorationEnabled()) {
+          updateScrollBehaviorOnTalkback(floatingToolbars, /* talkbackEnabled= */ true);
+        }
+      }
+    }
+
     return view;
   }
 
+  private void updateScrollBehaviorOnTalkback(
+      @NonNull List<FloatingToolbarLayout> floatingToolbars, boolean talkbackEnabled) {
+    for (FloatingToolbarLayout floatingToolbar : floatingToolbars) {
+      ((CoordinatorLayout.LayoutParams) floatingToolbar.getLayoutParams())
+          .setBehavior(talkbackEnabled ? null : new HideViewOnScrollBehavior<>());
+    }
+  }
+
   private void initializeOrientationButton(
       @NonNull View view,
       @NonNull List<FloatingToolbarLayout> floatingToolbars,