Merge "Don't NPE in PanelView"
This commit is contained in:
committed by
Android (Google) Code Review
commit
97002b2c0e
@@ -1172,9 +1172,11 @@ public abstract class PanelView extends FrameLayout {
|
||||
}
|
||||
|
||||
protected void notifyBarPanelExpansionChanged() {
|
||||
mBar.panelExpansionChanged(mExpandedFraction, mExpandedFraction > 0f
|
||||
|| mPeekAnimator != null || mInstantExpanding || isPanelVisibleBecauseOfHeadsUp()
|
||||
|| mTracking || mHeightAnimator != null);
|
||||
if (mBar != null) {
|
||||
mBar.panelExpansionChanged(mExpandedFraction, mExpandedFraction > 0f
|
||||
|| mPeekAnimator != null || mInstantExpanding
|
||||
|| isPanelVisibleBecauseOfHeadsUp() || mTracking || mHeightAnimator != null);
|
||||
}
|
||||
if (mExpansionListener != null) {
|
||||
mExpansionListener.accept(mExpandedFraction, mTracking);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user