diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-18 19:23:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-18 19:24:01 +0000 |
| commit | a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3 (patch) | |
| tree | a8f93f9b6c9727807af4749b7a2bcad51e360efd /core/java/android/widget/ImageSwitcher.java | |
| parent | fbf255125bbab3c8a2753a9001cc2cf373120a0f (diff) | |
| parent | 7b9c912f536925ac6ec43935d6e97506851b33d6 (diff) | |
| download | frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.zip frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.tar.gz frameworks_base-a42d2eaf2d6b3cb6072e99b4904b76c8cc263cf3.tar.bz2 | |
Merge "Add @ResourceInt annotations on APIs"
Diffstat (limited to 'core/java/android/widget/ImageSwitcher.java')
| -rw-r--r-- | core/java/android/widget/ImageSwitcher.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/ImageSwitcher.java b/core/java/android/widget/ImageSwitcher.java index 80e908a..81636a7 100644 --- a/core/java/android/widget/ImageSwitcher.java +++ b/core/java/android/widget/ImageSwitcher.java @@ -16,6 +16,7 @@ package android.widget; +import android.annotation.DrawableRes; import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -23,7 +24,6 @@ import android.util.AttributeSet; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; - public class ImageSwitcher extends ViewSwitcher { public ImageSwitcher(Context context) @@ -35,7 +35,7 @@ public class ImageSwitcher extends ViewSwitcher super(context, attrs); } - public void setImageResource(int resid) + public void setImageResource(@DrawableRes int resid) { ImageView image = (ImageView)this.getNextView(); image.setImageResource(resid); |