summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ProgressBar.java
diff options
context:
space:
mode:
authorNoraBora <noranbora@gmail.com>2009-12-25 19:51:34 -0500
committerNoraBora <noranbora@gmail.com>2009-12-30 08:59:14 -0500
commita7f7e2ac9270e58f8c45006a239a1c3c0cdc0309 (patch)
treee22ef083d959917b00db9060503720859eb2a466 /core/java/android/widget/ProgressBar.java
parent51207b127bcd6a1eb48141f9f4b2ce86ee3154ae (diff)
downloadframeworks_base-a7f7e2ac9270e58f8c45006a239a1c3c0cdc0309.zip
frameworks_base-a7f7e2ac9270e58f8c45006a239a1c3c0cdc0309.tar.gz
frameworks_base-a7f7e2ac9270e58f8c45006a239a1c3c0cdc0309.tar.bz2
guess default mMaxHeight but allow layout to override this.
without this code, progress bar height gets smaller when thumb gets bigger in AbsSeekBar.java onSizeChanged().
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
-rw-r--r--core/java/android/widget/ProgressBar.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index 2f28d9f..54269e1 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -177,6 +177,7 @@ 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.
setProgressDrawable(drawable);
}
@@ -421,6 +422,13 @@ public class ProgressBar extends View {
public void setProgressDrawable(Drawable d) {
if (d != null) {
d.setCallback(this);
+
+ // without this code, progress bar height will be updated.
+ int drawableHeight = drawable.getMinimumHeight();
+ if (mMaxHeight < drawableHeight) {
+ mMaxHeight = drawableHeight;
+ requestLayout();
+ }
}
mProgressDrawable = d;
if (!mIndeterminate) {