Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b94493fe authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android (Google) Code Review
Browse files

Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread

parents ae66946b c6b0b775
Loading
Loading
Loading
Loading
+15 −3
Original line number Original line Diff line number Diff line
@@ -261,6 +261,12 @@ public class ImageView extends View {
    /**
    /**
     * Sets a drawable as the content of this ImageView.
     * Sets a drawable as the content of this ImageView.
     *
     *
     * <p class="note">This does Bitmap reading and decoding on the UI
     * thread, which can cause a latency hiccup.  If that's a concern,
     * consider using {@link #setImageDrawable} or
     * {@link #setImageBitmap} and
     * {@link android.graphics.BitmapFactory} instead.</p>
     *
     * @param resId the resource identifier of the the drawable
     * @param resId the resource identifier of the the drawable
     *
     *
     * @attr ref android.R.styleable#ImageView_src
     * @attr ref android.R.styleable#ImageView_src
@@ -280,6 +286,12 @@ public class ImageView extends View {
    /**
    /**
     * Sets the content of this ImageView to the specified Uri.
     * Sets the content of this ImageView to the specified Uri.
     *
     *
     * <p class="note">This does Bitmap reading and decoding on the UI
     * thread, which can cause a latency hiccup.  If that's a concern,
     * consider using {@link #setImageDrawable} or
     * {@link #setImageBitmap} and
     * {@link android.graphics.BitmapFactory} instead.</p>
     *
     * @param uri The Uri of an image
     * @param uri The Uri of an image
     */
     */
    @android.view.RemotableViewMethod
    @android.view.RemotableViewMethod