From 8d21bdb90573ec48491c44eca312c162e262298d Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Wed, 30 Dec 2009 13:54:04 -0800 Subject: [PATCH] Fix the build. --- core/java/android/widget/ProgressBar.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 54269e1ed093e..1dcb20375c4f5 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -177,7 +177,8 @@ public class ProgressBar extends View { Drawable drawable = a.getDrawable(R.styleable.ProgressBar_progressDrawable); if (drawable != null) { drawable = tileify(drawable, false); - // guess mMaxHeight. but allow XML layout to override this. + // Calling this method can set mMaxHeight, make sure the corresponding + // XML attribute for mMaxHeight is read after calling this method setProgressDrawable(drawable); } @@ -423,8 +424,8 @@ public class ProgressBar extends View { if (d != null) { d.setCallback(this); - // without this code, progress bar height will be updated. - int drawableHeight = drawable.getMinimumHeight(); + // Make sure the ProgressBar is always tall enough + int drawableHeight = d.getMinimumHeight(); if (mMaxHeight < drawableHeight) { mMaxHeight = drawableHeight; requestLayout();