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 581de875: am 25c8477a: Merge "Improvements around CollapsingToolbarLayout\'s scrims" into mnc-ub-dev

Browse Source 
* commit '581de87570b31ac402eb2be6467227e59c475462':
  Improvements around CollapsingToolbarLayout's scrims

GitOrigin-RevId=8942fdd83bf150fc26e198e1b2dafcbff00e79ef

PiperOrigin-RevId: 140549623
This commit is contained in:
Chris Banes 2016-11-30 01:27:22 +00:00 committed by Travis Collins
parent aae3438182
commit e8cf5f6678
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -84,6 +84,8 @@ package android.support.design.widget {
method public void setExpandedTitleColor(int);
method public void setExpandedTitleGravity(int);
method public void setExpandedTitleTextAppearance(int);
method public void setScrimsShown(boolean);
method public void setScrimsShown(boolean, boolean);
method public void setStatusBarScrim(android.graphics.drawable.Drawable);
method public void setStatusBarScrimColor(int);
method public void setStatusBarScrimResource(int);

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

@ -464,25 +464,38 @@ public class CollapsingToolbarLayout extends FrameLayout {
return mCollapsingTitleEnabled;
}
private void showScrim() {
if (!mScrimsAreShown) {
if (ViewCompat.isLaidOut(this) && !isInEditMode()) {
animateScrim(255);
} else {
setScrimAlpha(255);
}
mScrimsAreShown = true;
}
/**
* Set whether the content scrim and/or status bar scrim should be shown or not. Any change
* in the vertical scroll may overwrite this value. Any visibility change will be animated if
* this view has already been laid out.
*
* @param shown whether the scrims should be shown
*
* @see #getStatusBarScrim()
* @see #getContentScrim()
*/
public void setScrimsShown(boolean shown) {
setScrimsShown(shown, ViewCompat.isLaidOut(this) && !isInEditMode());
}
private void hideScrim() {
if (mScrimsAreShown) {
if (ViewCompat.isLaidOut(this) && !isInEditMode()) {
animateScrim(0);
/**
* Set whether the content scrim and/or status bar scrim should be shown or not. Any change
* in the vertical scroll may overwrite this value.
*
* @param shown whether the scrims should be shown
* @param animate whether to animate the visibility change
*
* @see #getStatusBarScrim()
* @see #getContentScrim()
*/
public void setScrimsShown(boolean shown, boolean animate) {
if (mScrimsAreShown != shown) {
if (animate) {
animateScrim(shown ? 0xFF : 0x0);
} else {
setScrimAlpha(0);
setScrimAlpha(shown ? 0xFF : 0x0);
}
mScrimsAreShown = false;
mScrimsAreShown = shown;
}
}
@ -531,11 +544,14 @@ public class CollapsingToolbarLayout extends FrameLayout {
if (mContentScrim != null) {
mContentScrim.setCallback(null);
}
mContentScrim = drawable;
drawable.setBounds(0, 0, getWidth(), getHeight());
drawable.setCallback(this);
drawable.mutate().setAlpha(mScrimAlpha);
if (drawable != null) {
mContentScrim = drawable.mutate();
drawable.setBounds(0, 0, getWidth(), getHeight());
drawable.setCallback(this);
drawable.setAlpha(mScrimAlpha);
} else {
mContentScrim = null;
}
ViewCompat.postInvalidateOnAnimation(this);
}
}
@ -880,11 +896,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
// Show or hide the scrims if needed
if (mContentScrim != null || mStatusBarScrim != null) {
if (getHeight() + verticalOffset < getScrimTriggerOffset() + insetTop) {
showScrim();
} else {
hideScrim();
}
setScrimsShown(getHeight() + verticalOffset < getScrimTriggerOffset() + insetTop);
}
if (mStatusBarScrim != null && insetTop > 0) {