From 00c62d21c9e21eb595d2d83bddcf6782a9773729 Mon Sep 17 00:00:00 2001
From: Material Design Team <noreply@google.com>
Date: Wed, 20 Jul 2022 19:15:08 +0000
Subject: [PATCH] [AppBarLayout] Fix bug in HeaderScrollingViewBehavior that
 causes child translation Y not to be reset to default if the behavior is
 changed from an overlapping to non-overlapping behavior in
 layoutParams.setBehavior

PiperOrigin-RevId: 462201550
(cherry picked from commit 7fc2aed7dc871b117ca876006d444da9098fb39d)
---
 .../android/material/appbar/HeaderScrollingViewBehavior.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/java/com/google/android/material/appbar/HeaderScrollingViewBehavior.java b/lib/java/com/google/android/material/appbar/HeaderScrollingViewBehavior.java
index 2b2a4b6b71a..b561622e29f 100644
--- a/lib/java/com/google/android/material/appbar/HeaderScrollingViewBehavior.java
+++ b/lib/java/com/google/android/material/appbar/HeaderScrollingViewBehavior.java
@@ -86,6 +86,7 @@ public boolean onMeasureChild(
         if (shouldHeaderOverlapScrollingChild()) {
           child.setTranslationY(-headerHeight);
         } else {
+          child.setTranslationY(0);
           height -= headerHeight;
         }
         final int heightMeasureSpec =