DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

am c25d71b7: am 756b701d: Merge "Fix CollapsingToolbarLayout when used with SearchView" into mnc-ub-dev

Browse Source 
* commit 'c25d71b7961bb54676a9989b77d9ac4834d5698c':
  Fix CollapsingToolbarLayout when used with SearchView

GitOrigin-RevId=f6cb6956bc3f8af302d222a6534c906f7c67efde

PiperOrigin-RevId: 140550256
This commit is contained in:
Chris Banes 2016-11-30 01:33:47 +00:00 committed by Travis Collins
parent f89dafbdec
commit b5ab60dc9a
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/android/support/design/widget/CollapsingToolbarLayout.java
View File

@ -104,6 +104,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
private final Rect mTmpRect = new Rect();
private final CollapsingTextHelper mCollapsingTextHelper;
private boolean mCollapsingTitleEnabled;
private boolean mDrawCollapsingTitle;
private Drawable mContentScrim;
private Drawable mStatusBarScrim;
@ -258,7 +259,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
}
// Let the collapsing text helper draw it's text
if (mCollapsingTitleEnabled) {
if (mCollapsingTitleEnabled && mDrawCollapsingTitle) {
mCollapsingTextHelper.draw(canvas);
}
@ -367,17 +368,23 @@ public class CollapsingToolbarLayout extends FrameLayout {
// Update the collapsed bounds by getting it's transformed bounds. This needs to be done
// before the children are offset below
if (mCollapsingTitleEnabled && mDummyView != null) {
ViewGroupUtils.getDescendantRect(this, mDummyView, mTmpRect);
mCollapsingTextHelper.setCollapsedBounds(mTmpRect.left, bottom - mTmpRect.height(),
mTmpRect.right, bottom);
// Update the expanded bounds
mCollapsingTextHelper.setExpandedBounds(
mExpandedMarginLeft,
mTmpRect.bottom + mExpandedMarginTop,
right - left - mExpandedMarginRight,
bottom - top - mExpandedMarginBottom);
// We only draw the title if the dummy view is being displayed (Toolbar removes
// views if there is no space)
mDrawCollapsingTitle = mDummyView.isShown();
mCollapsingTextHelper.recalculate();
if (mDrawCollapsingTitle) {
ViewGroupUtils.getDescendantRect(this, mDummyView, mTmpRect);
mCollapsingTextHelper.setCollapsedBounds(mTmpRect.left, bottom - mTmpRect.height(),
mTmpRect.right, bottom);
// Update the expanded bounds
mCollapsingTextHelper.setExpandedBounds(
mExpandedMarginLeft,
mTmpRect.bottom + mExpandedMarginTop,
right - left - mExpandedMarginRight,
bottom - top - mExpandedMarginBottom);
// Now recalculate using the new bounds
mCollapsingTextHelper.recalculate();
}
}
// Update our child view offset helpers