Fix non-scrollable bottomsheet corners when set directly to STATE_EXP…

…ANDED

PiperOrigin-RevId: 230933282

lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java

@@ -678,6 +678,7 @@ public void setBottomSheetCallback(BottomSheetCallback callback) {
  * or {@link #STATE_HALF_EXPANDED}.
  */
  public final void setState(@State int state) {
+ @State int previousState = this.state;
  if (state == this.state) {
  return;
  }
@@ -692,6 +693,7 @@ public final void setState(@State int state) {
  return;
  }
  startSettlingAnimationPendingLayout(state);
+ updateDrawableOnStateChange(state, previousState);
  }
 
  private void startSettlingAnimationPendingLayout(@State int state) {
@@ -761,12 +763,14 @@ void setStateInternal(@State int state) {
 
  private void updateDrawableOnStateChange(@State int state, @State int previousState) {
  if (materialShapeDrawable != null) {
- if (state == STATE_EXPANDED && (parentHeight <= viewRef.get().getHeight())) {
- // If the bottomsheet is fully expanded, change ShapeAppearance to sharp corners to
- // indicate the bottomsheet has no more content to scroll.
- // Overriding of this style may be performed in the bottomsheet callback.
- materialShapeDrawable.getShapeAppearanceModel().setCornerRadius(0);
- materialShapeDrawable.invalidateSelf();
+ // If the BottomSheetBehavior's state is set directly to STATE_EXPANDED from
+ // STATE_HIDDEN or STATE_COLLAPSED, bypassing STATE_DRAGGING, the corner transition animation
+ // will not be triggered automatically, so we will trigger it here.
+ if (state == STATE_EXPANDED
+ && (previousState == STATE_HIDDEN || previousState == STATE_COLLAPSED)
+ && interpolatorAnimator != null
+ && interpolatorAnimator.getAnimatedFraction() == 1) {
+ interpolatorAnimator.reverse();
  }
  if (state == STATE_DRAGGING
  && previousState == STATE_EXPANDED && interpolatorAnimator != null) {