Update BottomAppBar to reposition the FAB when the vertical offset is changed

PiperOrigin-RevId: 245446154

Author: cketcham

lib/java/com/google/android/material/bottomappbar/BottomAppBar.java

@@ -144,7 +144,6 @@ public class BottomAppBar extends Toolbar implements AttachedBehavior {
   public @interface FabAnimationMode {}
 
   private final int fabOffsetEndMode;
-  private final int fabVerticalOffset;
   private final MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable();
 
   @Nullable private Animator modeAnimator;
@@ -235,7 +234,7 @@ public BottomAppBar(Context context, @Nullable AttributeSet attrs, int defStyleA
     float fabCradleMargin = a.getDimensionPixelOffset(R.styleable.BottomAppBar_fabCradleMargin, 0);
     float fabCornerRadius =
         a.getDimensionPixelOffset(R.styleable.BottomAppBar_fabCradleRoundedCornerRadius, 0);
-    fabVerticalOffset =
+    float fabVerticalOffset =
         a.getDimensionPixelOffset(R.styleable.BottomAppBar_fabCradleVerticalOffset, 0);
     fabAlignmentMode =
         a.getInt(R.styleable.BottomAppBar_fabAlignmentMode, FAB_ALIGNMENT_MODE_CENTER);
@@ -360,6 +359,7 @@ public void setCradleVerticalOffset(@Dimension float verticalOffset) {
     if (verticalOffset != getCradleVerticalOffset()) {
       getTopEdgeTreatment().setCradleVerticalOffset(verticalOffset);
       materialShapeDrawable.invalidateSelf();
+      setCutoutState();
     }
   }
 
@@ -633,7 +633,7 @@ public void onAnimationEnd(Animator animation) {
   }
 
   private float getFabTranslationY() {
-    return -fabVerticalOffset;
+    return -getTopEdgeTreatment().getCradleVerticalOffset();
   }
 
   private float getFabTranslationX(@FabAlignmentMode int fabAlignmentMode) {