1 files changed, 10 insertions, 2 deletions
diff --git a/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java b/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java
index 4299c41..ce6609e 100644
--- a/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java
+++ b/lottie_loading_layout/src/com/google/android/setupdesign/GlifLoadingLayout.java
@@ -17,6 +17,7 @@
 package com.google.android.setupdesign;
 
 import static com.google.android.setupcompat.partnerconfig.Util.isNightMode;
+import static java.lang.Math.min;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
@@ -395,9 +396,9 @@ public class GlifLoadingLayout extends GlifLayout {
           paddingBottom =
               (int) configPaddingBottom
                   - (int)
-                      Math.min(
+                      min(
                           configPaddingBottom,
-                          getResources().getDimension(R.dimen.sud_glif_footer_min_height));
+                          getButtonContainerHeight(footerBarMixin.getButtonContainer()));
         }
       }
     }
@@ -405,6 +406,13 @@ public class GlifLoadingLayout extends GlifLayout {
     linearLayout.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
   }
 
+  private static final int getButtonContainerHeight(View view) {
+    view.measure(
+        MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+        MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+    return view.getMeasuredHeight();
+  }
+
   private void inflateLottieView() {
     final View lottieLayout = peekLottieLayout();
     if (lottieLayout == null) {