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

Add extra flag to setPeekHeight that controls whether the sheet animates between the original peek height and the new peek height.

Browse Source 
PiperOrigin-RevId: 215428993
This commit is contained in:
Material Design Team 2018-10-02 14:44:50 -04:00 committed by Daniel Nizri
parent 24bb55bbf0
commit aec9964104
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
View File

@ -527,6 +527,19 @@ public class BottomSheetBehavior<V extends View> extends CoordinatorLayout.Behav
* @attr ref com.google.android.material.R.styleable#BottomSheetBehavior_Layout_behavior_peekHeight
*/
public final void setPeekHeight(int peekHeight) {
setPeekHeight(peekHeight, false);
}
/**
* Sets the height of the bottom sheet when it is collapsed while optionally animating between the
* old height and the new height.
*
* @param peekHeight The height of the collapsed bottom sheet in pixels, or {@link
* #PEEK_HEIGHT_AUTO} to configure the sheet to peek automatically at 16:9 ratio keyline.
* @param animate Whether to animate between the old height and the new height.
* @attr ref com.google.android.material.R.styleable#BottomSheetBehavior_Layout_behavior_peekHeight
*/
public final void setPeekHeight(int peekHeight, boolean animate) {
boolean layout = false;
if (peekHeight == PEEK_HEIGHT_AUTO) {
if (!peekHeightAuto) {
@ -542,7 +555,11 @@ public class BottomSheetBehavior<V extends View> extends CoordinatorLayout.Behav
if (layout && state == STATE_COLLAPSED && viewRef != null) {
V view = viewRef.get();
if (view != null) {
view.requestLayout();
if (animate) {
startSettlingAnimationPendingLayout(state);
} else {
view.requestLayout();
}
}
}
}
@ -630,6 +647,10 @@ public class BottomSheetBehavior<V extends View> extends CoordinatorLayout.Behav
}
return;
}
startSettlingAnimationPendingLayout(state);
}
private void startSettlingAnimationPendingLayout(@State int state) {
final V child = viewRef.get();
if (child == null) {
return;