Merge "docs: Added min/max values and descriptions for alpha getter/setter in ImageView am: bdb308a059 am: 3b0cfd76c2" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-09-27 00:06:14 +00:00
committed by Android (Google) Code Review

View File

@@ -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()
*/