diff options
author | Steve Howard <showard@google.com> | 2010-08-20 19:06:23 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 19:06:23 -0700 |
commit | 6d895fdbc023743f3870042e73a5614764e4165b (patch) | |
tree | 02320cdf82903f804d35e5d208c001a8af8cbf63 | |
parent | 63f05fe487d23e559e9d3f2c285d1c35aa75b9b3 (diff) | |
parent | d2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf (diff) | |
download | frameworks_base-6d895fdbc023743f3870042e73a5614764e4165b.zip frameworks_base-6d895fdbc023743f3870042e73a5614764e4165b.tar.gz frameworks_base-6d895fdbc023743f3870042e73a5614764e4165b.tar.bz2 |
am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf' into gingerbread-plus-aosp
* commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf':
Make ProgressBar.setVisibility() remotable.
-rw-r--r-- | core/java/android/widget/ProgressBar.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index c0a546d..ec7d927 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -21,8 +21,9 @@ import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.BitmapShader; import android.graphics.Canvas; -import android.graphics.Shader; import android.graphics.Rect; +import android.graphics.Shader; +import android.graphics.drawable.Animatable; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ClipDrawable; @@ -30,11 +31,14 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.StateListDrawable; -import android.graphics.drawable.Animatable; import android.graphics.drawable.shapes.RoundRectShape; import android.graphics.drawable.shapes.Shape; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.SystemClock; import android.util.AttributeSet; import android.view.Gravity; +import android.view.RemotableViewMethod; import android.view.View; import android.view.ViewDebug; import android.view.animation.AlphaAnimation; @@ -44,9 +48,6 @@ import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; import android.view.animation.Transformation; import android.widget.RemoteViews.RemoteView; -import android.os.Parcel; -import android.os.Parcelable; -import android.os.SystemClock; import com.android.internal.R; @@ -762,6 +763,7 @@ public class ProgressBar extends View { } @Override + @RemotableViewMethod public void setVisibility(int v) { if (getVisibility() != v) { super.setVisibility(v); |