Fix height of Slider when floating label is false

PiperOrigin-RevId: 286201599

Author: cketcham

lib/java/com/google/android/material/slider/Slider.java

@@ -180,12 +180,10 @@ public class Slider extends View {
   @NonNull private TooltipDrawable label;
 
   private int widgetHeight;
-  private int widgetHeightLabel;
   private boolean floatingLabel;
   private int trackHeight;
   private int trackSidePadding;
   private int trackTop;
-  private int trackTopLabel;
   private int thumbRadius;
   private int haloRadius;
   private int labelPadding;
@@ -322,11 +320,9 @@ public void onFocusChange(View v, boolean hasFocus) {
 
   private void loadResources(@NonNull Resources resources) {
     widgetHeight = resources.getDimensionPixelSize(R.dimen.mtrl_slider_widget_height);
-    widgetHeightLabel = resources.getDimensionPixelSize(R.dimen.mtrl_slider_widget_height_label);
 
     trackSidePadding = resources.getDimensionPixelOffset(R.dimen.mtrl_slider_track_side_padding);
     trackTop = resources.getDimensionPixelOffset(R.dimen.mtrl_slider_track_top);
-    trackTopLabel = resources.getDimensionPixelOffset(R.dimen.mtrl_slider_track_top_label);
 
     labelPadding = resources.getDimensionPixelSize(R.dimen.mtrl_slider_label_padding);
   }
@@ -774,7 +770,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     super.onMeasure(
         widthMeasureSpec,
         MeasureSpec.makeMeasureSpec(
-            floatingLabel ? widgetHeight : widgetHeightLabel, MeasureSpec.EXACTLY));
+            widgetHeight + (floatingLabel ? 0 : label.getIntrinsicHeight()), MeasureSpec.EXACTLY));
   }
 
   @Override
@@ -833,7 +829,7 @@ private void updateHaloHotSpot() {
   }
 
   private int calculateTop() {
-    return floatingLabel ? trackTop : trackTopLabel;
+    return trackTop + (floatingLabel ? 0 : label.getIntrinsicHeight());
   }
 
   @Override

lib/java/com/google/android/material/slider/res/values/dimens.xml

@@ -17,11 +17,9 @@
 <resources>
 
   <dimen name="mtrl_slider_widget_height">48dp</dimen>
-  <dimen name="mtrl_slider_widget_height_label">68dp</dimen>
 
   <dimen name="mtrl_slider_track_side_padding">16dp</dimen>
   <dimen name="mtrl_slider_track_top">24dp</dimen>
-  <dimen name="mtrl_slider_track_top_label">44dp</dimen>
   <dimen name="mtrl_slider_track_height">4dp</dimen>
 
   <dimen name="mtrl_slider_thumb_radius">10dp</dimen>