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

Commit a9360b98 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "docs: Added min/max values and descriptions for alpha getter/setter in... 

Merge "docs: Added min/max values and descriptions for alpha getter/setter in ImageView am: bdb308a0 am: 3b0cfd76" into nyc-mr1-dev-plus-aosp
parents 4434fb33 6d53bf09

core/java/android/widget/ImageView.java

+5 −2
Original line number Diff line number Diff line
@@ -1441,7 +1441,9 @@ public class ImageView extends View { 
    /**

     * Returns the alpha that will be applied to the drawable of this ImageView.

     *

     * @return the alpha that will be applied to the drawable of this ImageView

     * @return the alpha value that will be applied to the drawable of this

     * ImageView (between 0 and 255 inclusive, with 0 being transparent and

     * 255 being opaque)

     *

     * @see #setImageAlpha(int)

     */
@@ -1452,7 +1454,8 @@ public class ImageView extends View { 
    /**

     * Sets the alpha value that should be applied to the image.

     *

     * @param alpha the alpha value that should be applied to the image

     * @param alpha the alpha value that should be applied to the image (between

     * 0 and 255 inclusive, with 0 being transparent and 255 being opaque)

     *

     * @see #getImageAlpha()

     */