diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-05-14 09:32:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 09:32:40 +0000 |
| commit | 18ee0524f02dda8ea1a16c083238ab6ddb2735ab (patch) | |
| tree | 736040b7794feedd32e7f51593c72581066ec365 | |
| parent | e094b2aff04105d63fa930f873a948e4104ca0f0 (diff) | |
| parent | e695bb8a28cb47e8ad0c8948bb76bd25907f1f3b (diff) | |
| download | frameworks_base-18ee0524f02dda8ea1a16c083238ab6ddb2735ab.zip frameworks_base-18ee0524f02dda8ea1a16c083238ab6ddb2735ab.tar.gz frameworks_base-18ee0524f02dda8ea1a16c083238ab6ddb2735ab.tar.bz2 | |
Merge "Fix build; doc link in ImageView" into mnc-dev
| -rw-r--r-- | core/java/android/widget/ImageView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 94cda88..73a873a 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -468,7 +468,7 @@ public class ImageView extends View { * * <p class="note">Depending on the Icon type, this may do Bitmap reading and decoding * on the UI thread, which can cause UI jank. If that's a concern, consider using - * {@link Icon#loadDrawableAsync(Context, Handler, Icon.OnDrawableLoadedListener)} + * {@link Icon#loadDrawableAsync(Context, Icon.OnDrawableLoadedListener, Handler)} * and then {@link #setImageDrawable(android.graphics.drawable.Drawable)} instead.</p> * * @param icon an Icon holding the desired image |