Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the build.

Browse Source
This commit is contained in:
Romain Guy
2009-12-30 13:54:04 -08:00
parent a7f7e2ac92
commit 8d21bdb905
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/ProgressBar.java
View File

@@ -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();