From c79ff658dae6bb280ffaedf9020c318e4c9cf722 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 05:03:35 +0000 Subject: [PATCH] Merge \"Fix CollapsingToolbarLayout pinned views with insets\" into nyc-support-24.1-dev am: 9e55ffc203 Change-Id: I8a4dbb9ee60468ff68024b81e2c4592c46039830 GitOrigin-RevId=497afd753b419ba61f44b548efbf92bb1a4b7375 PiperOrigin-RevId: 140564112 --- .../support/design/widget/CollapsingToolbarLayout.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/android/support/design/widget/CollapsingToolbarLayout.java b/src/android/support/design/widget/CollapsingToolbarLayout.java index 951fe5cd8..6b2595c57 100644 --- a/src/android/support/design/widget/CollapsingToolbarLayout.java +++ b/src/android/support/design/widget/CollapsingToolbarLayout.java @@ -234,14 +234,17 @@ public class CollapsingToolbarLayout extends FrameLayout { // Add an OnOffsetChangedListener if possible final ViewParent parent = getParent(); if (parent instanceof AppBarLayout) { + // Copy over from the ABL whether we should fit system windows + ViewCompat.setFitsSystemWindows(this, ViewCompat.getFitsSystemWindows((View) parent)); + if (mOnOffsetChangedListener == null) { mOnOffsetChangedListener = new OffsetUpdateListener(); } ((AppBarLayout) parent).addOnOffsetChangedListener(mOnOffsetChangedListener); - } - // We're attached, so lets request an inset dispatch - ViewCompat.requestApplyInsets(this); + // We're attached, so lets request an inset dispatch + ViewCompat.requestApplyInsets(this); + } } @Override