From 2c8e5ffbdfc09bab354b3a23b044bd6fd45791b5 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 03:42:08 +0000
Subject: [PATCH] Fix scrolling view overlapping AppBarLayout am: e04ed82f45
 am: fcac85f0c6

* commit 'fcac85f0c65e3b7deabe34713bb555131bb6d3a4':
  Fix scrolling view overlapping AppBarLayout

GitOrigin-RevId=83836dc0bdaa2a0e9d33596ae48e0681710fc868

PiperOrigin-RevId: 140559341
---
 .../widget/HeaderScrollingViewBehavior.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/android/support/design/widget/HeaderScrollingViewBehavior.java b/src/android/support/design/widget/HeaderScrollingViewBehavior.java
index 3fe7bfa79..e9e16d1ec 100644
--- a/src/android/support/design/widget/HeaderScrollingViewBehavior.java
+++ b/src/android/support/design/widget/HeaderScrollingViewBehavior.java
@@ -95,25 +95,24 @@ abstract class HeaderScrollingViewBehavior extends ViewOffsetBehavior<View> {
     }
 
     @Override
-    protected void layoutChild(CoordinatorLayout parent, View child, int layoutDirection) {
+    protected void layoutChild(final CoordinatorLayout parent, final View child,
+            final int layoutDirection) {
         final List<View> dependencies = parent.getDependencies(child);
         final View header = findFirstDependency(dependencies);
 
         if (header != null) {
             final CoordinatorLayout.LayoutParams lp =
                     (CoordinatorLayout.LayoutParams) child.getLayoutParams();
-            final Rect parentRect = mTempRect1;
-            parentRect.set(parent.getPaddingLeft() + lp.leftMargin,
-                    parent.getPaddingTop() + lp.topMargin,
+            final Rect available = mTempRect1;
+            available.set(parent.getPaddingLeft() + lp.leftMargin,
+                    header.getBottom() + lp.topMargin,
                     parent.getWidth() - parent.getPaddingRight() - lp.rightMargin,
-                    parent.getHeight() - parent.getPaddingBottom() - lp.bottomMargin);
-
-            parentRect.top += header.getMeasuredHeight();
-            parentRect.bottom += header.getMeasuredHeight();
+                    parent.getHeight() + header.getBottom()
+                            - parent.getPaddingBottom() - lp.bottomMargin);
 
             final Rect out = mTempRect2;
             GravityCompat.apply(resolveGravity(lp.gravity), child.getMeasuredWidth(),
-                    child.getMeasuredHeight(), parentRect, out, layoutDirection);
+                    child.getMeasuredHeight(), available, out, layoutDirection);
 
             child.layout(out.left, out.top, out.right, out.bottom);
         } else {